April 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6945 - in trunk: theme/src/bin/portal-ajax-war/dyna and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 17:06:48 -0400 (Sat, 07 Apr 2007) New Revision: 6945 Added: trunk/theme/src/bin/test/theme-test-war/file.txt Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: don't intercept URLs that don't start with the server URL Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -53,15 +53,12 @@ Object response = cmd.invokeNext(); // Configure ajax if needed - if (response instanceof PageRendition && cmd instanceof RenderPageCommand) + if (response instanceof PageRendition) { - RenderPageCommand rpc = (RenderPageCommand)cmd; - - // ServerInvocationContext serverContext = cmd.getControllerContext().getServerInvocation().getServerContext(); // - ControllerContext controllerContext = rpc.getControllerContext(); + ControllerContext controllerContext = cmd.getControllerContext(); // PageRendition rendition = (PageRendition)response; @@ -72,20 +69,23 @@ String viewId = ctx.getViewId(); // - ServerURL surl = new AbstractServerURL(); - surl.setPortalRequestPath("/ajax"); - String url = serverContext.renderURL(surl, serverContext.getURLContext(), URLFormat.newInstance(true, true)); + ServerURL baseServerURL = new AbstractServerURL(); + baseServerURL.setPortalRequestPath("/"); + String url = serverContext.renderURL(baseServerURL, serverContext.getURLContext(), URLFormat.newInstance(true, true)); // pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax/dyna"); - pageProps.put(DynaConstants.ASYNC_SERVER_URL, url); + pageProps.put(DynaConstants.SERVER_BASE_URL, url); pageProps.put(DynaConstants.VIEW_STATE, viewId); // If user is logged in and is on dashboard we enable ajax - if (serverContext.getClientRequest().getRemoteUser() != null && - rpc.isDashboard()) + if (cmd instanceof RenderPageCommand) { - AJAX_OPTIONS.setOptions(pageProps); + RenderPageCommand rpc = (RenderPageCommand)cmd; + if (serverContext.getClientRequest().getRemoteUser() != null && rpc.isDashboard()) + { + AJAX_OPTIONS.setOptions(pageProps); + } } } Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 21:06:48 UTC (rev 6945) @@ -98,6 +98,31 @@ } } + // Check that the URL starts with the provided prefix + if (url != null) + { + if (url.indexOf("http://") == 0) + { + var indexOfSlash = url.indexOf("/", "http://".length); + if (indexOfSlash < 0) + { + url = null; + } + else if (indexOfSlash > 0) + { + var path = url.substring(indexOfSlash); + if (path.indexOf(server_base_url) != 0) + { + url = null; + } + } + } + else if (url.indexOf(server_base_url) != 0) + { + url = null; + } + } + // Handle links here if (url != null) { Added: trunk/theme/src/bin/test/theme-test-war/file.txt =================================================================== --- trunk/theme/src/bin/test/theme-test-war/file.txt (rev 0) +++ trunk/theme/src/bin/test/theme-test-war/file.txt 2007-04-07 21:06:48 UTC (rev 6945) @@ -0,0 +1 @@ +Content of the file Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -39,18 +39,18 @@ /** . */ private HttpServletRequest request; - private String asyncServerURL; + /** . */ + private String serverBaseURL; - public TestContext(HttpServletRequest request) { this.request = request; - this.asyncServerURL = request.getContextPath() + "/test"; + this.serverBaseURL = request.getContextPath() + "/test"; } - public String getAsyncServerURL() + public String getServerBaseURL() { - return asyncServerURL; + return serverBaseURL; } public Counter getCounter(WindowId windowId) @@ -70,8 +70,11 @@ public WindowResult renderWindow(WindowId windowId) { Counter counter = getCounter(windowId); - String link = asyncServerURL + "?windowId=" + windowId + "&action=increment"; - return createWindowMarkup("Window Title", "Counter value is " + counter.getValue() + ", <a href=\"" + link + "\">Increment counter</a>"); + String link = serverBaseURL + "?windowId=" + windowId + "&action=increment"; + return createWindowMarkup("Window Title", + "Counter value is " + counter.getValue() + ", <a href=\"" + link + "\">Increment counter</a><br/>" + + "Link to a resource <a href=\"" + request.getContextPath() + "/file.txt\">Resource</a><br/>" + + "Inline javascript <a href=\"javascript:alert('The Alert');\">Resource</a><br/>"); } private WindowResult createWindowMarkup(String title, String content) Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -139,7 +139,7 @@ // pageRenderCtx.setLayoutState(null); pageRenderCtx.getPageProperties().put(DynaConstants.DYNA_RESOURCE_BASE_URL, request.getContextPath() + "/dyna"); - pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL, testContext.getAsyncServerURL()); + pageRenderCtx.getPageProperties().put(DynaConstants.SERVER_BASE_URL, testContext.getServerBaseURL()); // pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_THEME, theme.getThemeInfo().getName()); Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -129,7 +129,7 @@ // Map pageProps = new HashMap(); pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax"); - pageProps.put(DynaConstants.ASYNC_SERVER_URL, "http://localhost:8080/portal-ajax/ajax"); + pageProps.put(DynaConstants.SERVER_BASE_URL, "http://localhost:8080/portal-ajax/ajax"); // Map portalProps = new HashMap(); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -33,7 +33,7 @@ public static final String DYNA_RESOURCE_BASE_URL = "theme.dyna.resource_base_url"; /** . */ - public static final String ASYNC_SERVER_URL = "theme.dyna.async_server_url"; + public static final String SERVER_BASE_URL = "theme.dyna.server_base_url"; /** The id for view state. */ public static final String VIEW_STATE = "theme.dyna.view_state"; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 21:06:48 UTC (rev 6945) @@ -108,7 +108,7 @@ { PrintWriter markup = rendererContext.getWriter(); String jsBase = rendererContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); - String asyncServerURL = rendererContext.getProperty(DynaConstants.ASYNC_SERVER_URL); + String serverBaseURL = rendererContext.getProperty(DynaConstants.SERVER_BASE_URL); String viewState = rendererContext.getProperty(DynaConstants.VIEW_STATE); // Handle special ajax region here @@ -132,8 +132,8 @@ markup.print("<script type='text/javascript'>\n"); // Async server URL needed for callbacks - markup.print("async_server_url=\""); - markup.print(asyncServerURL); + markup.print("server_base_url=\""); + markup.print(serverBaseURL); markup.print("\";\n"); // View state if not null

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6944 - in trunk: core/src/main/org/jboss/portal/core/controller/ajax and 11 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 16:11:25 -0400 (Sat, 07 Apr 2007) New Revision: 6944 Added: trunk/theme/src/main/org/jboss/portal/test/theme/Counter.java trunk/theme/src/main/org/jboss/portal/test/theme/RegionDef.java trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java trunk/theme/src/main/org/jboss/portal/test/theme/WindowId.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java trunk/theme/src/main/org/jboss/portal/theme/render/AbstractObjectRenderer.java Removed: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/bin/test/theme-test-war/layouts/generic/index.jsp trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/JSONMarshaller.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java trunk/theme/src/main/org/jboss/portal/theme/page/Region.java trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java Log: - added in renderer a contextualization phase which helps to separate contextualization/uncontextualization of the RenderContext when a RendererContext is pushed on the stack instead of rendering it, improving fragment rendering - added a simple test application for the dyna renderers Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -51,6 +51,7 @@ import org.jboss.portal.theme.page.PageRendition; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; import org.jboss.portal.theme.page.Region; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; @@ -79,6 +80,9 @@ private static Logger log = Logger.getLogger(PageCustomizerInterceptor.class); /** . */ + private static final DynaRenderOptions NO_AJAX_OPTIONS = DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE); + + /** . */ private static final String RESOURCE_PREFIX = "PAGENAME_"; /** . */ @@ -124,7 +128,7 @@ // Region region = rendition.getPageResult().getRegion2("navigation"); - region.setProperty(DynaConstants.OBJECT_ENABLED, "false"); + NO_AJAX_OPTIONS.setOptions(region.getProperties()); } } @@ -142,7 +146,7 @@ // Region region = rendition.getPageResult().getRegion2("dashboardnav"); - region.setProperty(DynaConstants.OBJECT_ENABLED, "false"); + NO_AJAX_OPTIONS.setOptions(region.getProperties()); } } Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -30,6 +30,7 @@ import org.jboss.portal.core.model.portal.ns.PortalObjectNavigationalStateContext; import org.jboss.portal.theme.page.PageRendition; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocationContext; @@ -44,6 +45,9 @@ public class AjaxInterceptor extends ControllerInterceptor { + /** . */ + private static final DynaRenderOptions AJAX_OPTIONS = DynaRenderOptions.getOptions(Boolean.TRUE, Boolean.TRUE); + public Object invoke(ControllerCommand cmd) throws Exception, InvocationException { Object response = cmd.invokeNext(); @@ -59,27 +63,29 @@ // ControllerContext controllerContext = rpc.getControllerContext(); + // + PageRendition rendition = (PageRendition)response; + Map pageProps = rendition.getPageResult().getPageProperties(); + + // + PortalObjectNavigationalStateContext ctx = (PortalObjectNavigationalStateContext)controllerContext.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); + String viewId = ctx.getViewId(); + + // + ServerURL surl = new AbstractServerURL(); + surl.setPortalRequestPath("/ajax"); + String url = serverContext.renderURL(surl, serverContext.getURLContext(), URLFormat.newInstance(true, true)); + + // + pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax/dyna"); + pageProps.put(DynaConstants.ASYNC_SERVER_URL, url); + pageProps.put(DynaConstants.VIEW_STATE, viewId); + // If user is logged in and is on dashboard we enable ajax if (serverContext.getClientRequest().getRemoteUser() != null && rpc.isDashboard()) { - ServerURL surl = new AbstractServerURL(); - surl.setPortalRequestPath("/ajax"); - String url = serverContext.renderURL(surl, serverContext.getURLContext(), URLFormat.newInstance(true, true)); - - // - PortalObjectNavigationalStateContext ctx = (PortalObjectNavigationalStateContext)controllerContext.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); - String viewId = ctx.getViewId(); - - // - PageRendition rendition = (PageRendition)response; - Map pageProps = rendition.getPageResult().getPageProperties(); - - // - pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax/dyna"); - pageProps.put(DynaConstants.OBJECT_ENABLED, "true"); - pageProps.put(DynaConstants.ASYNC_SERVER_URL, url); - pageProps.put(DynaConstants.VIEW_STATE, viewId); + AJAX_OPTIONS.setOptions(pageProps); } } Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -56,15 +56,17 @@ import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageLocationResponse; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageStateResponse; -import org.jboss.portal.theme.impl.render.dynamic.DynaStatus; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderStatus; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PageService; +import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.theme.page.Region; import javax.servlet.ServletException; import java.io.IOException; @@ -292,11 +294,14 @@ WindowContext wc = new WindowContext( _window.getName(), _window.getId().toString(PortalObjectId.LEGACY_BASE64_FORMAT), - "ABC", + _window.getProperty(ThemeConstants.PORTAL_PROP_REGION), 0, windowResult); // + res.addWindowContext(wc); + + // MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo(); // The buffer @@ -311,13 +316,22 @@ // get render context RendererContext rendererContext = layout.getRenderContext(themeContext, markupInfo, dispatcher, buffer); - // Should push region context as well - DynaStatus.set(rendererContext, DynaStatus.DYNA_RENDERED_VALUE); + // Push page rendererContext.pushObjectRenderContext(res); + // Push regin + Region region = res.getRegion2(wc.getRegionName()); + rendererContext.pushObjectRenderContext(region); + // Render rendererContext.render(wc); + // Pop region + rendererContext.popObjectRenderContext(); + + // Pop page + rendererContext.popObjectRenderContext(); + // Add render to the page updatePage.addFragment(wc.getId(), buffer.toString()); } Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 20:11:25 UTC (rev 6944) @@ -105,7 +105,7 @@ var headers = ["ajax","true"]; // Add the view state value - if (view_state !== undefined) + if (view_state != null) { headers.view_state = view_state; } @@ -139,7 +139,10 @@ } // update view state - view_state = resp.view_state; + if (resp.view_state != null) + { + view_state = resp.view_state; + } } else if (resp.type == "update_page") { @@ -203,11 +206,11 @@ snapshot(); // Find the dyna portlets - var portlets_on_page = document.getElementsByClassName("dyna-window"); + var portlets_on_page = document.getElementsByClassName("async-window"); // Add listener for the dyna windows for(var i = 0;i < portlets_on_page.length;i++) { - var portlet = portlets_on_page[i]; + var portlet = Element.up(portlets_on_page[i]); Event.observe(portlet, "click", bilto); } } Modified: trunk/theme/src/bin/test/theme-test-war/layouts/generic/index.jsp =================================================================== --- trunk/theme/src/bin/test/theme-test-war/layouts/generic/index.jsp 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/bin/test/theme-test-war/layouts/generic/index.jsp 2007-04-07 20:11:25 UTC (rev 6944) @@ -9,8 +9,10 @@ </head> <body> <p:region regionName='AJAXScripts' regionID='AJAXScripts'/> -<p:region regionName='left' regionID='regionA'/> -<p:region regionName='center' regionID='regionB'/> +<p:region regionName='RegionA' regionID='regionA'/> +<p:region regionName='RegionB' regionID='regionB'/> +<p:region regionName='RegionC' regionID='regionC'/> +<p:region regionName='RegionD' regionID='regionD'/> <p:region regionName='AJAXFooter' regionID='AJAXFooter'/> </body> </html> Added: trunk/theme/src/main/org/jboss/portal/test/theme/Counter.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/Counter.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/test/theme/Counter.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,51 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.theme; + +import javax.servlet.http.HttpSession; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class Counter +{ + + /** . */ + private int value; + + public Counter(int value) + { + this.value = value; + } + + public void increment() + { + value++; + } + + public int getValue() + { + return value; + } +} Added: trunk/theme/src/main/org/jboss/portal/test/theme/RegionDef.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/RegionDef.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/test/theme/RegionDef.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.theme; + +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class RegionDef +{ + + /** . */ + private String name; + + /** . */ + private DynaRenderOptions renderOptions; + + public RegionDef(String name, DynaRenderOptions renderOptions) + { + this.name = name; + this.renderOptions = renderOptions; + } + + public String getName() + { + return name; + } + + public DynaRenderOptions getRenderOptions() + { + return renderOptions; + } +} Added: trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,89 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.theme; + +import org.jboss.portal.theme.page.WindowResult; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.Collections; +import java.util.HashMap; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class TestContext +{ + + /** . */ + private HttpServletRequest request; + + private String asyncServerURL; + + + public TestContext(HttpServletRequest request) + { + this.request = request; + this.asyncServerURL = request.getContextPath() + "/test"; + } + + public String getAsyncServerURL() + { + return asyncServerURL; + } + + public Counter getCounter(WindowId windowId) + { + HttpSession session = request.getSession(); + + // + Counter counter = (Counter)session.getAttribute(windowId.toString()); + if (counter == null) + { + counter = new Counter(0); + session.setAttribute(windowId.toString(), counter); + } + return counter; + } + + public WindowResult renderWindow(WindowId windowId) + { + Counter counter = getCounter(windowId); + String link = asyncServerURL + "?windowId=" + windowId + "&action=increment"; + return createWindowMarkup("Window Title", "Counter value is " + counter.getValue() + ", <a href=\"" + link + "\">Increment counter</a>"); + } + + private WindowResult createWindowMarkup(String title, String content) + { + return new WindowResult( + title, + content, + Collections.EMPTY_MAP, + new HashMap(), + null, + null, + null, + null); + } +} Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -32,7 +32,11 @@ import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.page.Region; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; +import org.jboss.portal.theme.impl.render.dynamic.JSONMarshaller; +import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageStateResponse; import org.jboss.portal.theme.PortalRenderSet; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.ThemeContext; @@ -48,14 +52,42 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import java.io.IOException; -import java.util.HashMap; -import java.util.Collections; +import java.io.StringWriter; +import java.util.Map; +import java.util.Iterator; +import java.util.HashSet; +import java.util.LinkedHashMap; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class TestServlet extends HttpServlet { + /** . */ + private Map page; + + public TestServlet() + { + this.page = new LinkedHashMap(); + + // + RegionDef regionA = new RegionDef("RegionA", DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE)); + RegionDef regionB = new RegionDef("RegionB", DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.TRUE)); + RegionDef regionC = new RegionDef("RegionC", DynaRenderOptions.getOptions(Boolean.TRUE, Boolean.FALSE)); + RegionDef regionD = new RegionDef("RegionD", DynaRenderOptions.getOptions(Boolean.TRUE, Boolean.TRUE)); + + // + page.put(new WindowId(0), regionA); + page.put(new WindowId(1), regionA); + page.put(new WindowId(2), regionB); + page.put(new WindowId(3), regionB); + page.put(new WindowId(4), regionC); + page.put(new WindowId(5), regionC); + page.put(new WindowId(6), regionD); + page.put(new WindowId(7), regionD); + } + + /** * Generates a portal page with windows, using the theme api. */ @@ -79,20 +111,35 @@ ServletContainerContext servletContainerContext = (ServletContainerContext)MBeanProxy.get(ServletContainerContext.class, new ObjectName("portal:service=ServletContainerContext"), mbeanServer); LayoutService layoutService = (LayoutService)MBeanProxy.get(LayoutService.class, new ObjectName("portal:service=LayoutService"), mbeanServer); ThemeService themeService = (ThemeService)MBeanProxy.get(ThemeService.class, new ObjectName("portal:service=ThemeService"), mbeanServer); - PortalRenderSet renderSet = layoutService.getRenderSet("testRenderer", MediaType.HTML); PortalLayout layout = layoutService.getLayout("generic", true); PortalTheme theme = themeService.getTheme("testTheme", true); + // + TestContext testContext = new TestContext(request); + + // Handle action here + WindowId windowId = request.getParameter("windowId") != null ? new WindowId(request.getParameter("windowId")) : null; + String action = request.getParameter("action"); + if ("increment".equals(action)) + { + Counter counter = testContext.getCounter(windowId); + counter.increment(); + } + + // + boolean ajax = "true".equals(request.getHeader("ajax")); + MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8"); + ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, response, servletContainerContext); + ThemeContext themeContext = new ThemeContext(theme, themeService); + // Build a page structure PageResult pageRenderCtx = new PageResult("test_page"); // pageRenderCtx.setLayoutState(null); - - // pageRenderCtx.getPageProperties().put(DynaConstants.DYNA_RESOURCE_BASE_URL, request.getContextPath() + "/dyna"); - pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL, request.getContextPath()); + pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL, testContext.getAsyncServerURL()); // pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_THEME, theme.getThemeInfo().getName()); @@ -100,61 +147,48 @@ pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_LAYOUT, layout.getLayoutInfo().getName()); // - for (int i = 0; i < 2; i++) + for (Iterator i = page.entrySet().iterator();i.hasNext();) { - WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_" + i, "left", i, createWindowMarkup("WindowA_" + i + " Title", "WindowA_" + i + " Content")); - pageRenderCtx.addWindowContext(wCtx); + Map.Entry entry = (Map.Entry)i.next(); + WindowId _windowId = (WindowId)entry.getKey(); + RegionDef region = (RegionDef)entry.getValue(); + WindowResult window = testContext.renderWindow(_windowId); + pageRenderCtx.addWindow(region.getName(), _windowId.toString(), window.toString(), window); } - for (int i = 0; i < 2; i++) + + // + for (Iterator i = new HashSet(page.values()).iterator();i.hasNext();) { - WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_" + i, "center", i, createWindowMarkup("WindowB_" + i + " Title", "WindowB_" + i + " Content")); - pageRenderCtx.addWindowContext(wCtx); + RegionDef region = (RegionDef)i.next(); + region.getRenderOptions().setOptions(pageRenderCtx.getRegion2(region.getName()).getProperties()); } // - MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8"); + if (ajax) + { + WindowContext windowCtx = pageRenderCtx.getWindowContext(windowId.toString()); + Region region = pageRenderCtx.getRegion2(windowCtx.getRegionName()); - ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, response, servletContainerContext); + // + StringWriter buffer = new StringWriter(); + RendererContext rendererCtx = layout.getRenderContext(themeContext, markupInfo, dispatcher, buffer); + rendererCtx.pushObjectRenderContext(pageRenderCtx); + rendererCtx.pushObjectRenderContext(region); + rendererCtx.render(windowCtx); - ThemeContext themeContext = new ThemeContext(theme, themeService); + // + UpdatePageStateResponse resp = new UpdatePageStateResponse(null); + resp.addFragment(windowId.toString(), buffer.toString()); + JSONMarshaller marshaller = new JSONMarshaller(); - RendererContext rendererCtx = layout.getRenderContext(themeContext, markupInfo, dispatcher); - - pageRenderCtx.getPageProperties().put(DynaConstants.OBJECT_ENABLED, "true"); - - rendererCtx.render(pageRenderCtx); - - -// // -// ServerRequest serverRequest = new ServerRequest(null); -// -// // pageresult obj -// PageResult pageResult = new PageResult(TEST_PAGE_NAME, pageProps, portalProps); -// pageResult.setLayoutURI(layout.getLayoutInfo().getURI()); -// pageResult.setTheme(theme); -// -// // set the renderctx and req/res attr -//// RenderContext renderCtx = new RenderContext(layout, markupInfo, pageResult); -//// response.setContentType(renderCtx.getContentType().toString()); -//// response.setCharacterEncoding(renderCtx.getCharset()); -//// request.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, renderCtx); -//// request.setAttribute(LayoutConstants.ATTR_PAGE, pageResult); -//// request.setAttribute(ThemeConstants.ATTR_THEME, theme); -// -// // -//// LayoutDispatcher dispatcher1 = new LayoutDispatcher(renderCtx, request, response, pageResult); -//// dispatcher1.include(); + // + response.setContentType("text/xml"); + marshaller.write(resp, response.getWriter()); + } + else + { + RendererContext rendererCtx = layout.getRenderContext(themeContext, markupInfo, dispatcher); + rendererCtx.render(pageRenderCtx); + } } - - /** - * Generates the WindowResult for our windowcontext - * - * @param sTitle - * @param sContent - * @return window markup result - */ - private WindowResult createWindowMarkup(String sTitle, String sContent) - { - return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null, null); - } } Added: trunk/theme/src/main/org/jboss/portal/test/theme/WindowId.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/WindowId.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/test/theme/WindowId.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,54 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.theme; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class WindowId +{ + + /** . */ + private final int value; + + public WindowId(int value) + { + this.value = value; + } + + public int getValue() + { + return value; + } + + public WindowId(String value) + { + this.value = Integer.parseInt(value.substring("WindowId_".length())); + } + + public String toString() + { + return "WindowId_" + value; + } +} Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,13 +26,14 @@ import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import java.io.PrintWriter; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ -public class TestDecorationRenderer +public class TestDecorationRenderer extends AbstractObjectRenderer implements DecorationRenderer { public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,13 +26,14 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.renderer.PortletRendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import java.io.PrintWriter; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ -public class TestPortletRenderer +public class TestPortletRenderer extends AbstractObjectRenderer implements PortletRenderer { public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.util.Iterator; @@ -34,7 +35,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ -public class TestRegionRenderer +public class TestRegionRenderer extends AbstractObjectRenderer implements RegionRenderer { Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,20 +26,21 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.renderer.WindowRendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import java.io.PrintWriter; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ -public class TestWindowRenderer implements WindowRenderer +public class TestWindowRenderer extends AbstractObjectRenderer implements WindowRenderer { public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { PrintWriter writer = rendererContext.getWriter(); - writer.print("<div class=\"test-window\">"); + writer.print("<div class=\"test-window\">\n"); rendererContext.render(wrc.getDecoration()); rendererContext.render(wrc.getPortlet()); - writer.print("</div>"); + writer.print("\n</div>\n"); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -34,6 +34,7 @@ import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.RendererFactory; import org.jboss.portal.theme.render.ThemeContext; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.WindowState; import org.jboss.portal.web.ServletContextDispatcher; import org.jboss.portal.common.util.MarkupInfo; @@ -62,7 +63,6 @@ return new JSPRendererContext(themeContext, factory, dispatcher, markupInfo); } - public RendererContext getRenderContext(ThemeContext themeContext, MarkupInfo markupInfo, ServletContextDispatcher dispatcher, Writer writer) { RendererFactory factory = new RendererFactoryImpl(this, serviceInfo, info); @@ -71,6 +71,14 @@ return new WriterRendererContext(themeContext, factory, dispatcher, markupInfo, new PrintWriter(writer)); } + public void startContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + } + + public void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + } + public void render(RendererContext rendererContext, PageRendererContext prc) throws RenderException { PageResult pageResult = (PageResult)prc; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -27,6 +27,7 @@ import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import org.jboss.portal.theme.render.renderer.ActionRendererContext; @@ -46,7 +47,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ -public class DivDecorationRenderer +public class DivDecorationRenderer extends AbstractObjectRenderer implements DecorationRenderer { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.renderer.PortletRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.PortletRendererContext; import java.io.PrintWriter; @@ -36,7 +37,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ -public class DivPortletRenderer implements PortletRenderer +public class DivPortletRenderer extends AbstractObjectRenderer implements PortletRenderer { public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.renderer.WindowRendererContext; @@ -39,7 +40,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ -public class DivRegionRenderer +public class DivRegionRenderer extends AbstractObjectRenderer implements RegionRenderer { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.WindowRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; @@ -36,7 +37,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ -public class DivWindowRenderer +public class DivWindowRenderer extends AbstractObjectRenderer implements WindowRenderer { public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -29,25 +29,19 @@ public final class DynaConstants { - /** The mask for the DnDability. */ - public static final int DYNA_DND_MASK = 0x01; - - /** The mask for asynchronous windows. */ - public static final int DYNA_ASYNC_WINDOW_MASK = 0x02; - /** . */ public static final String DYNA_RESOURCE_BASE_URL = "theme.dyna.resource_base_url"; /** . */ public static final String ASYNC_SERVER_URL = "theme.dyna.async_server_url"; - /** . */ - public static final String OBJECT_ENABLED = "theme.dyna.object_enabled"; - /** The id for view state. */ public static final String VIEW_STATE = "theme.dyna.view_state"; /** . */ + public static final String DYNA_RENDER_OPTIONS = "dyna_render_options"; + + /** . */ public static final String DYNA_RENDER_STATUS = "dyna_render_status"; } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import java.io.PrintWriter; @@ -37,7 +38,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ -public class DynaDecorationRenderer implements DecorationRenderer +public class DynaDecorationRenderer extends AbstractObjectRenderer implements DecorationRenderer { /** . */ @@ -51,22 +52,24 @@ public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException { - switch(DynaStatus.get(rendererContext)) + DynaRenderOptions regionOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); + + // + if (regionOptions.isDnDEnabled()) { - case DynaStatus.DYNA_RENDERED_VALUE: - DynaWindowRenderer.handleProvided.set(Boolean.TRUE); + DynaWindowRenderer.handleProvided.set(Boolean.TRUE); - // - PrintWriter markup = rendererContext.getWriter(); - markup.print("<div class=\"dyna-decoration\">\n"); - markup.print("<div class=\"handle\">"); - delegate.render(rendererContext, drc); - markup.print("</div>\n"); - markup.print("</div>\n"); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.render(rendererContext, drc); - break; + // + PrintWriter markup = rendererContext.getWriter(); + markup.print("<div class=\"dyna-decoration\">\n"); + markup.print("<div class=\"handle\">"); + delegate.render(rendererContext, drc); + markup.print("</div>\n"); + markup.print("</div>\n"); } + else + { + delegate.render(rendererContext, drc); + } } } \ No newline at end of file Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.render.renderer.PortletRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.PortletRendererContext; import java.io.PrintWriter; @@ -38,7 +39,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ -public class DynaPortletRenderer implements PortletRenderer +public class DynaPortletRenderer extends AbstractObjectRenderer implements PortletRenderer { private PortletRenderer delegate; @@ -58,45 +59,39 @@ private void doDND(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - switch(DynaStatus.get(rendererContext)) + DynaRenderOptions regionOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); + + // + if (regionOptions.isDnDEnabled()) { - case DynaStatus.DYNA_RENDERED_VALUE: - // Provide handle on content if needed - if (Boolean.FALSE.equals(DynaWindowRenderer.handleProvided.get())) - { - // - DynaWindowRenderer.handleProvided.set(Boolean.TRUE); + // Provide handle on content if needed + if (Boolean.FALSE.equals(DynaWindowRenderer.handleProvided.get())) + { + // + DynaWindowRenderer.handleProvided.set(Boolean.TRUE); - // + // // StringBuffer out = renderContext.getMarkupFragment(); // out.append("<span class=\"handle\">"); - doCatchClicks(rendererContext, prc); + doCatchClicks(rendererContext, prc); // out.append("</span>"); - } - else - { - doCatchClicks(rendererContext, prc); - } - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: + } + else + { doCatchClicks(rendererContext, prc); - break; + } } + else + { + doCatchClicks(rendererContext, prc); + } } private void doCatchClicks(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - switch(DynaStatus.get(rendererContext)) - { - case DynaStatus.DYNA_RENDERED_VALUE: - PrintWriter out = rendererContext.getWriter(); - out.print("<div class=\"dyna-portlet\">"); - delegate.render(rendererContext, prc); - out.print("</div>"); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.render(rendererContext, prc); - break; - } + PrintWriter out = rendererContext.getWriter(); + out.print("<div class=\"dyna-portlet\">"); + delegate.render(rendererContext, prc); + out.print("</div>"); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -48,6 +48,8 @@ import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import java.io.PrintWriter; @@ -59,7 +61,7 @@ * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ -public class DynaRegionRenderer implements RegionRenderer +public class DynaRegionRenderer extends AbstractObjectRenderer implements RegionRenderer { /** . */ @@ -72,6 +74,36 @@ delegate = regionRenderer; } + public void startContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + RegionRendererContext rrc = (RegionRendererContext)objectRenderContext; + + // + if ("AJAXScripts".equals(rrc.getId()) || "AJAXFooter".equals(rrc.getId())) + { + DynaRenderStatus.set(rendererContext, false); + } + else + { + String dndValue = rendererContext.getProperty(DynaRenderOptions.DND_ENABLED); + String asyncWindowValue = rendererContext.getProperty(DynaRenderOptions.ASYNC_WINDOW_ENABLED); + DynaRenderOptions options = DynaRenderOptions.getOptions(dndValue, asyncWindowValue); + + // + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_OPTIONS, options); + DynaRenderStatus.set(rendererContext, true); + } + } + + + public void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + if (DynaRenderStatus.get(rendererContext)) + { + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_OPTIONS, null); + } + } + public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { PrintWriter markup = rendererContext.getWriter(); @@ -79,138 +111,95 @@ String asyncServerURL = rendererContext.getProperty(DynaConstants.ASYNC_SERVER_URL); String viewState = rendererContext.getProperty(DynaConstants.VIEW_STATE); - // - Object onPage = rendererContext.getProperty(DynaConstants.OBJECT_ENABLED); - boolean pageEnabled = onPage != null && "true".equals(onPage); - - // - int status = DynaStatus.CLASSIC_RENDERED_VALUE; - // Handle special ajax region here if ("AJAXScripts".equals(rrc.getId())) { - status = DynaStatus.NOT_RENDERED_VALUE; + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/prototype.js'></script>\n"); + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/scriptaculous.js'></script>\n"); + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/effects.js'></script>\n"); + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/dragdrop.js'></script>\n"); + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/dyna.js'></script>\n"); + markup.print("<script type='text/javascript'>\n"); - // - if (pageEnabled) - { - markup.print("<script type='text/javascript' src='"); - markup.print(jsBase); - markup.print("/prototype.js'></script>\n"); - markup.print("<script type='text/javascript' src='"); - markup.print(jsBase); - markup.print("/scriptaculous.js'></script>\n"); - markup.print("<script type='text/javascript' src='"); - markup.print(jsBase); - markup.print("/effects.js'></script>\n"); - markup.print("<script type='text/javascript' src='"); - markup.print(jsBase); - markup.print("/dragdrop.js'></script>\n"); - markup.print("<script type='text/javascript' src='"); - markup.print(jsBase); - markup.print("/dyna.js'></script>\n"); - markup.print("<script type='text/javascript'>\n"); + // Async server URL needed for callbacks + markup.print("async_server_url=\""); + markup.print(asyncServerURL); + markup.print("\";\n"); - // Async server URL needed for callbacks - markup.print("async_server_url=\""); - markup.print(asyncServerURL); + // View state if not null + if (viewState != null) + { + markup.print("view_state = \""); + markup.print(viewState); markup.print("\";\n"); - - // View state if not null - if (viewState != null) - { - markup.print("view_state=\""); - markup.print(viewState); - markup.print("\";\n"); - } - - // - markup.print("</script>\n"); } - } - else if ("AJAXFooter".equals(rrc.getId())) - { - status = DynaStatus.NOT_RENDERED_VALUE; - - // - if (pageEnabled) + else { - markup.print("<script type='text/javascript'>footer()</script>\n"); + markup.print("view_state = null;"); } + + // + markup.print("</script>\n"); } - else + else if ("AJAXFooter".equals(rrc.getId())) { - if (pageEnabled) - { - String onRegion = rrc.getProperty(DynaConstants.OBJECT_ENABLED); - boolean regionEnabled = onRegion == null || "true".equals(onRegion); - if (regionEnabled) - { - status = DynaStatus.DYNA_RENDERED_VALUE; - } - } + markup.print("<script type='text/javascript'>footer()</script>\n"); } // - rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, new Integer(status)); - - // - switch(status) + if (DynaRenderStatus.get(rendererContext)) { - case DynaStatus.DYNA_RENDERED_VALUE: - delegate.renderHeader(rendererContext, rrc); + delegate.renderHeader(rendererContext, rrc); - // We need height and width otherwise the region will not be usable when empty + // + DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); + + // + if (options.isDnDEnabled()) + { markup.print("<div class=\"dyna-region\" id=\""); markup.print(rrc.getId()); markup.print("\">"); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderHeader(rendererContext, rrc); - break; - case DynaStatus.NOT_RENDERED_VALUE: - break; + } } } - public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException + /** + * @see org.jboss.portal.theme.render.renderer.RegionRenderer#renderBody + */ + public void renderBody(RendererContext rendererContext, final RegionRendererContext rrc) throws RenderException { - int status = DynaStatus.get(rendererContext); - - // - rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, null); - - // - switch(status) + if (DynaRenderStatus.get(rendererContext)) { - case DynaStatus.DYNA_RENDERED_VALUE: - PrintWriter markup = rendererContext.getWriter(); - markup.print("</div>"); - delegate.renderFooter(rendererContext, rrc); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderFooter(rendererContext, rrc); - break; - case DynaStatus.NOT_RENDERED_VALUE: - break; + delegate.renderBody(rendererContext, rrc); } } - /** - * @see org.jboss.portal.theme.render.renderer.RegionRenderer#renderBody - */ - public void renderBody(RendererContext rendererContext, final RegionRendererContext rrc) throws RenderException + public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - switch(DynaStatus.get(rendererContext)) + if (DynaRenderStatus.get(rendererContext)) { - case DynaStatus.DYNA_RENDERED_VALUE: - delegate.renderBody(rendererContext, rrc); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderBody(rendererContext, rrc); - break; - case DynaStatus.NOT_RENDERED_VALUE: - break; + DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); + + // + if (options.isDnDEnabled()) + { + PrintWriter markup = rendererContext.getWriter(); + markup.print("</div>"); + } + + // + delegate.renderFooter(rendererContext, rrc); } } } Added: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,137 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.impl.render.dynamic; + +import java.util.Map; + +/** + * Encapsulate dyna render options. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class DynaRenderOptions +{ + + /** . */ + public static final String DND_ENABLED = "theme.dyna.dnd_enabled"; + + /** . */ + public static final String ASYNC_WINDOW_ENABLED = "theme.dyna.async_window_enabled"; + + /** + * Flyweight pattern. + */ + private static final DynaRenderOptions[] FLYWEIGHTS = + { + new DynaRenderOptions(null, null), + new DynaRenderOptions(Boolean.TRUE, null), + new DynaRenderOptions(Boolean.FALSE, null), + null, + new DynaRenderOptions(null, Boolean.TRUE), + new DynaRenderOptions(Boolean.TRUE, Boolean.TRUE), + new DynaRenderOptions(Boolean.FALSE, Boolean.TRUE), + null, + new DynaRenderOptions(null, Boolean.FALSE), + new DynaRenderOptions(Boolean.TRUE, Boolean.FALSE), + new DynaRenderOptions(Boolean.FALSE, Boolean.FALSE), + }; + + public static DynaRenderOptions getOptions(Boolean dnd, Boolean asyncWindow) + { + int index = dnd == null ? 0 : dnd.booleanValue() ? 1 : 2; + index += asyncWindow == null ? 0 : asyncWindow.booleanValue() ? 4 : 8; + return FLYWEIGHTS[index]; + } + + public static DynaRenderOptions getOptions(String dndValue, String asyncWindowValue) + { + Boolean dnd = dndValue == null ? null : Boolean.valueOf(dndValue); + Boolean asyncValue = asyncWindowValue == null ? null : Boolean.valueOf(asyncWindowValue); + return getOptions(dnd, asyncValue); + } + + public static DynaRenderOptions getOptions(Map propertyMap) + { + String dndValue = (String)propertyMap.get(DND_ENABLED); + String asyncWindowValue = (String)propertyMap.get(ASYNC_WINDOW_ENABLED); + return getOptions(dndValue, asyncWindowValue); + } + + /** + * Set the options on the specifed property map. + * + * @param propertyMap the map to alter + */ + public void setOptions(Map propertyMap) + { + if (dnd != null) + { + propertyMap.put(DND_ENABLED, dnd.toString()); + } + else + { + propertyMap.remove(DND_ENABLED); + } + if (dnd != null) + { + propertyMap.put(ASYNC_WINDOW_ENABLED, asyncWindow.toString()); + } + else + { + propertyMap.remove(ASYNC_WINDOW_ENABLED); + } + } + + /** . */ + private final Boolean dnd; + + /** . */ + private final Boolean asyncWindow; + + private DynaRenderOptions(Boolean dnd, Boolean asyncWindow) + { + this.dnd = dnd; + this.asyncWindow = asyncWindow; + } + + public Boolean getDnD() + { + return dnd; + } + + public boolean isDnDEnabled() + { + return dnd != null && dnd.booleanValue(); + } + + public Boolean getAsyncWindow() + { + return asyncWindow; + } + + public boolean isAsyncWindowEnabled() + { + return asyncWindow != null && asyncWindow.booleanValue(); + } +} Copied: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java (from rev 6942, trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,51 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.impl.render.dynamic; + +import org.jboss.portal.theme.render.RendererContext; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class DynaRenderStatus +{ + + public static boolean get(RendererContext rendererContext) + { + Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_STATUS); + return status == null || status.booleanValue(); + } + + public static boolean remove(RendererContext rendererContext) + { + Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_STATUS); + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, null); + return status == null || status.booleanValue(); + } + + public static void set(RendererContext rendererContext, boolean status) + { + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, Boolean.valueOf(status)); + } +} Deleted: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -1,59 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.impl.render.dynamic; - -import org.jboss.portal.theme.render.RendererContext; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class DynaStatus -{ - - /** . */ - private static final Integer[] INTEGERS = {new Integer(0),new Integer(1),new Integer(2),new Integer(3)}; - - /** . */ - public static final int UNKNOWN_VALUE = 0; - - /** . */ - public static final int DYNA_RENDERED_VALUE = 2; - - /** . */ - public static final int CLASSIC_RENDERED_VALUE = 3; - - /** . */ - public static final int NOT_RENDERED_VALUE = 4; - - public static int get(RendererContext rendererContext) - { - Integer status = (Integer)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_STATUS); - return status != null ? status.intValue() : UNKNOWN_VALUE; - } - - public static void set(RendererContext rendererContext, int status) - { - rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, INTEGERS[status]); - } -} Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.WindowRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; @@ -38,7 +39,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ -public class DynaWindowRenderer implements WindowRenderer +public class DynaWindowRenderer extends AbstractObjectRenderer implements WindowRenderer { // @@ -56,29 +57,48 @@ /** @see org.jboss.portal.theme.render.renderer.WindowRenderer#render */ public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - switch(DynaStatus.get(rendererContext)) + DynaRenderOptions regionOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); + + // + String dndValue = rendererContext.getProperty(DynaRenderOptions.DND_ENABLED); + String asyncWindowValue = rendererContext.getProperty(DynaRenderOptions.ASYNC_WINDOW_ENABLED); + DynaRenderOptions windowOptions = DynaRenderOptions.getOptions(dndValue, asyncWindowValue); + + // + PrintWriter out = rendererContext.getWriter(); + out.print("<div class=\"dyna-window\">"); + out.print("<div id=\""); + out.print(wrc.getId()); + if (regionOptions.isDnDEnabled()) { - case DynaStatus.DYNA_RENDERED_VALUE: - // For now we say we have no provided any handle so far for the window - handleProvided.set(Boolean.FALSE); + if (windowOptions.isAsyncWindowEnabled()) + { + out.print("\" class=\"dnd-window async-window\">\n"); + } + else + { + out.print("\" class=\"dnd-window\">\n"); + } + } + else + { + if (windowOptions.isAsyncWindowEnabled()) + { + out.print("\" class=\"async-window\">\n"); + } + else + { + out.print("\">\n"); + } + } - // - PrintWriter out = rendererContext.getWriter(); - out.print("<div class=\"dyna-window\"><div id=\""); - out.print(wrc.getId()); - out.print("\"/>\n"); - delegate.render(rendererContext, wrc); - out.print("</div></div>\n"); + // + delegate.render(rendererContext, wrc); - // - handleProvided.set(null); - break; - case DynaStatus.CLASSIC_RENDERED_VALUE: - handleProvided.set(null); + // + out.print("</div></div>\n"); - // - delegate.render(rendererContext, wrc); - break; - } + // + handleProvided.set(null); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/JSONMarshaller.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/JSONMarshaller.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/JSONMarshaller.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -54,9 +54,14 @@ // writer.key("type").value("update_markup"); - writer.key("view_state").value(umr.getViewState()); // + if (umr.getViewState() != null) + { + writer.key("view_state").value(umr.getViewState()); + } + + // writer.key("fragments").object(); for (Iterator i = umr.getFragments().entrySet().iterator();i.hasNext();) { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.DecorationRendererContext; /** @@ -34,7 +35,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ -public class EmptyDecorationRenderer +public class EmptyDecorationRenderer extends AbstractObjectRenderer implements DecorationRenderer { public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -25,6 +25,7 @@ import org.jboss.portal.theme.render.renderer.PortletRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.PortletRendererContext; /** @@ -34,7 +35,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ -public class EmptyPortletRenderer +public class EmptyPortletRenderer extends AbstractObjectRenderer implements PortletRenderer { public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.renderer.WindowRendererContext; @@ -41,7 +42,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ -public class EmptyRegionRenderer +public class EmptyRegionRenderer extends AbstractObjectRenderer implements RegionRenderer { private static Logger log = Logger.getLogger(EmptyRegionRenderer.class); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.AbstractObjectRenderer; import org.jboss.portal.theme.render.renderer.WindowRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; @@ -34,7 +35,7 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ -public class EmptyWindowRenderer implements WindowRenderer +public class EmptyWindowRenderer extends AbstractObjectRenderer implements WindowRenderer { public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -195,6 +195,23 @@ region.addWindowContext(windowContext); } + public WindowContext addWindow(String regionName, String windowId, String windowName, WindowResult window) + { + int order = 0; + + // + Region region = getRegion2(regionName); + if (region != null) + { + order = region.getWindows().size(); + } + + // + WindowContext windowCtx = new WindowContext(windowName, windowId, regionName, order, window); + addWindowContext(windowCtx); + return windowCtx; + } + // PageRenderContext implementation ********************************************************************************* public String getProperty(String name) Modified: trunk/theme/src/main/org/jboss/portal/theme/page/Region.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -69,35 +69,19 @@ this.name = name; this.windows = new ArrayList(); this.sorted = false; + this.properties = new HashMap(); } - public String getProperty(String name) + public Map getProperties() { - if (properties != null) - { - return (String)properties.get(name); - } - else - { - return null; - } + return properties; } public void setProperty(String name, String value) { - if (properties == null) - { - properties = new HashMap(); - } properties.put(name, value); } - /** @return the identifier of this region (i.e. the name of this region) */ - public String getId() - { - return name; - } - /** @return if there are any portlet windows in this region */ public boolean isEmpty() { @@ -115,14 +99,25 @@ windows.add(windowContext); } - /** - * Get a list of all window contexts in this region. The list is sorted by order according to the order provided in - * the window definition. - * - * @return a sorted list of <code>org.jboss.portal.theme.page.WindowContext</code> items - */ - public List getWindows2() + public String toString() { + return "Region[name" + name + "]"; + } + + // RegionRenderContext implementation ******************************************************************************* + + public String getId() + { + return name; + } + + public String getProperty(String name) + { + return (String)properties.get(name); + } + + public Collection getWindows() + { if (windows == null) { return Collections.EMPTY_LIST; @@ -135,18 +130,6 @@ return Collections.unmodifiableList(windows); } - public String toString() - { - return "Region[name" + name + "]"; - } - - // RegionRenderContext implementation ******************************************************************************* - - public Collection getWindows() - { - return windows; - } - public Orientation getOrientation() { return null; Added: trunk/theme/src/main/org/jboss/portal/theme/render/AbstractObjectRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/AbstractObjectRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/AbstractObjectRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public abstract class AbstractObjectRenderer implements ObjectRenderer +{ + + public void startContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + } + + public void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) + { + } +} Modified: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -31,4 +31,6 @@ */ public interface ObjectRenderer { + void startContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext); + void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext); } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -28,7 +28,6 @@ import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; -import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.renderer.PortletRendererContext; @@ -171,14 +170,19 @@ return null; } - public void pushObjectRenderContext(ObjectRendererContext ctx) + public void pushObjectRenderContext(ObjectRendererContext objectRendererContext) { - stack.add(ctx); + stack.add(objectRendererContext); + ObjectRenderer renderer = rendererFactory.getRenderer(this, objectRendererContext); + renderer.startContext(this, objectRendererContext); } public ObjectRendererContext popObjectRenderContext() { - return (ObjectRendererContext)stack.remove(stack.size() - 1); + ObjectRendererContext objectRendererContext = (ObjectRendererContext)stack.remove(stack.size() - 1); + ObjectRenderer renderer = rendererFactory.getRenderer(this, objectRendererContext); + renderer.endContext(this, objectRendererContext); + return objectRendererContext; } public void render(ObjectRendererContext ctx) throws RenderException, IllegalStateException Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java 2007-04-07 10:37:43 UTC (rev 6943) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java 2007-04-07 20:11:25 UTC (rev 6944) @@ -57,7 +57,7 @@ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); PageResult page = (PageResult)request.getAttribute(LayoutConstants.ATTR_PAGE); Region region = page.getRegion2(this.region); - if (region != null && region.getWindows2().iterator().hasNext()) + if (region != null && region.getWindows().iterator().hasNext()) { return Tag.SKIP_BODY; }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6943 - in trunk/theme/src/main/org/jboss/portal/theme: impl and 3 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 06:37:43 -0400 (Sat, 07 Apr 2007) New Revision: 6943 Added: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRendererContext.java Removed: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java Log: moved ObjectRenderer and ObjectRendererContext in the render package and let the renderer package contains the sub interface specialization Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -25,7 +25,7 @@ import org.jboss.portal.common.util.MediaType; import org.jboss.portal.theme.RuntimeContext; import org.jboss.portal.theme.ServerRegistrationID; -import org.jboss.portal.theme.render.renderer.ObjectRenderer; +import org.jboss.portal.theme.render.ObjectRenderer; import org.jboss.portal.theme.render.renderer.PortletRenderer; import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.renderer.DecorationRenderer; Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -33,7 +33,7 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.renderer.ObjectRenderer + * @see org.jboss.portal.theme.render.ObjectRenderer * @see org.jboss.portal.theme.PortalLayout */ public abstract class PortalTheme Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,7 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -23,9 +23,9 @@ package org.jboss.portal.theme.impl; import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.renderer.ObjectRenderer; +import org.jboss.portal.theme.render.ObjectRenderer; import org.jboss.portal.theme.render.RendererContext; -import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.renderer.WindowRendererContext; import org.jboss.portal.theme.render.renderer.PortletRendererContext; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,7 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -29,6 +29,12 @@ public final class DynaConstants { + /** The mask for the DnDability. */ + public static final int DYNA_DND_MASK = 0x01; + + /** The mask for asynchronous windows. */ + public static final int DYNA_ASYNC_WINDOW_MASK = 0x02; + /** . */ public static final String DYNA_RESOURCE_BASE_URL = "theme.dyna.resource_base_url"; Copied: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java (from rev 6942, trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render; + +/** + * Generic renderer interface extended by all members of a render set. + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + */ +public interface ObjectRenderer +{ +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRendererContext.java (from rev 6942, trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -0,0 +1,32 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface ObjectRendererContext +{ + String getProperty(String name); +} Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -28,7 +28,7 @@ import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.renderer.WindowRendererContext; -import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.ObjectRendererContext; import org.jboss.portal.theme.render.renderer.RegionRenderer; import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.renderer.PortletRendererContext; Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render; -import org.jboss.portal.theme.render.renderer.ObjectRenderer; -import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.ObjectRenderer; +import org.jboss.portal.theme.render.ObjectRendererContext; /** * A factory for providing the appropriate renderers. Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render.renderer; +import org.jboss.portal.theme.render.ObjectRendererContext; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ObjectRenderer; /** * A decoration renderer is responsible for generating the markup of the portlet window title bar. <p>The decoration Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render.renderer; +import org.jboss.portal.theme.render.ObjectRendererContext; + import java.util.Collection; /** Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render.renderer; - -/** - * Generic renderer interface extended by all members of a render set. - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.PortalRenderSet - */ -public interface ObjectRenderer -{ -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -1,32 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render.renderer; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface ObjectRendererContext -{ - String getProperty(String name); -} Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ObjectRenderer; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render.renderer; +import org.jboss.portal.theme.render.ObjectRendererContext; + import java.util.Collection; /** Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ObjectRenderer; /** * The portlet renderer is responsible for adding the created markup of a portlet to the page. <p>The portlet renderer Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render.renderer; +import org.jboss.portal.theme.render.ObjectRendererContext; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,6 +24,7 @@ import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ObjectRenderer; /** * A region renderer is responsible to create the markup container for a set of portlets on a page region. <p>The Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -23,6 +23,7 @@ package org.jboss.portal.theme.render.renderer; import org.jboss.portal.theme.Orientation; +import org.jboss.portal.theme.render.ObjectRendererContext; import java.util.Collection; Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ObjectRenderer; /** * A window renderer is responsible for the creation of the markup of each portlet window in a portal page region. <p>A Modified: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java 2007-04-07 10:37:43 UTC (rev 6943) @@ -24,6 +24,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.Mode; +import org.jboss.portal.theme.render.ObjectRendererContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6942 - in trunk: core/src/main/org/jboss/portal/core/impl/model/content and 18 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 06:13:16 -0400 (Sat, 07 Apr 2007) New Revision: 6942 Added: trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRendererContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/page/PortletRendererContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/ThemeContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java Removed: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java trunk/theme/src/main/org/jboss/portal/theme/page/Region.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java Log: - added ThemeContext object for carrying the current PortalTheme and the ThemeService for additional lookup - make some repackinging to avoid mess Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -56,19 +56,18 @@ import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageLocationResponse; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageStateResponse; -import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; import org.jboss.portal.theme.impl.render.dynamic.DynaStatus; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.WindowContext; import javax.servlet.ServletException; import java.io.IOException; -import java.io.PrintWriter; import java.io.StringWriter; import java.util.Set; import java.util.HashSet; @@ -306,15 +305,18 @@ // Get a dispatcher ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), controllerContext.getController().getServletContainerContext()); + // Not really used for now in that context, so we can pass null (need to change that of course) + ThemeContext themeContext = new ThemeContext(null, null); + // get render context - RenderContext renderContext = layout.getRenderContext(markupInfo, dispatcher, buffer); + RendererContext rendererContext = layout.getRenderContext(themeContext, markupInfo, dispatcher, buffer); // Should push region context as well - DynaStatus.set(renderContext, DynaStatus.DYNA_RENDERED_VALUE); - renderContext.pushObjectRenderContext(res); + DynaStatus.set(rendererContext, DynaStatus.DYNA_RENDERED_VALUE); + rendererContext.pushObjectRenderContext(res); // Render - renderContext.render(wc); + rendererContext.render(wc); // Add render to the page updatePage.addFragment(wc.getId(), buffer.toString()); Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -57,7 +57,7 @@ import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse; import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.render.ActionRenderContext; +import org.jboss.portal.theme.render.renderer.ActionRendererContext; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.Exceptions; @@ -309,8 +309,8 @@ windowTitle = "Portlet unavailable"; contentChars = "Portlet unavailable"; actionMap = new HashMap(); - actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); } } @@ -332,8 +332,8 @@ } if (RenderWindowCommand.SHOW.equals(cfg.getProperty(RenderWindowCommand.WINDOW_ACCESS_DENIED))) { - actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Access denied"; contentChars = "Access denied"; return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); @@ -347,8 +347,8 @@ } if (RenderWindowCommand.SHOW.equals(cfg.getProperty(RenderWindowCommand.WINDOW_NOT_FOUND))) { - actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Cannot render"; contentChars = "Object not found " + e.getRef(); return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); @@ -395,7 +395,7 @@ WindowResult.Action action = new WindowResult.Action(windowState.toString(), url, !disabled); windowStates.add(action); } - actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, windowStates); + actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, windowStates); } /** @@ -413,7 +413,7 @@ WindowResult.Action action = new WindowResult.Action(mode.toString(), url, !disabled); modes.add(action); } - actionMap.put(ActionRenderContext.MODES_KEY, modes); + actionMap.put(ActionRendererContext.MODES_KEY, modes); } private String createUpdateNavigationalStateURL(ControllerContext context, Window window, Mode mode, WindowState windowState) Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -113,7 +113,7 @@ result.addWindowContext(blah); // - return new PageRendition(layout, result, ps); + return new PageRendition(layout, null, result, ps); } catch (PortletInvokerException e) { Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -203,12 +203,6 @@ new HashMap(getPage().getDeclaredProperties()), new HashMap(getPage().getPortal().getDeclaredProperties())); - // Set the theme on the result - if (theme != null) - { - pageResult.setTheme(theme); - } - // Render the windows for (Iterator i = windows.iterator(); i.hasNext();) { @@ -257,17 +251,12 @@ } // - return new PageRendition(layout, pageResult, pageService); + return new PageRendition(layout, theme, pageResult, pageService); } catch (Exception e) { rethrow(e); } - finally - { - request.removeAttribute(ThemeConstants.ATTR_THEME_SERVER); - request.removeAttribute(ThemeConstants.ATTR_THEME); - } // return null; Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -49,7 +49,7 @@ import org.jboss.portal.theme.ThemeService; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.ServerRegistrationID; -import org.jboss.portal.theme.render.PortalRenderSet; +import org.jboss.portal.theme.PortalRenderSet; import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -33,8 +33,9 @@ import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; -import org.jboss.portal.theme.render.PortalRenderSet; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.PortalRenderSet; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.web.ServletContextDispatcher; @@ -87,7 +88,6 @@ PageResult pageRenderCtx = new PageResult("test_page"); // - pageRenderCtx.setTheme(theme); pageRenderCtx.setLayoutState(null); // @@ -116,15 +116,15 @@ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, response, servletContainerContext); - RenderContext renderCtx = layout.getRenderContext(markupInfo, dispatcher); + ThemeContext themeContext = new ThemeContext(theme, themeService); + RendererContext rendererCtx = layout.getRenderContext(themeContext, markupInfo, dispatcher); + pageRenderCtx.getPageProperties().put(DynaConstants.OBJECT_ENABLED, "true"); - renderCtx.setAttribute(ThemeConstants.ATTR_THEME, theme); + rendererCtx.render(pageRenderCtx); - renderCtx.render(pageRenderCtx); - // // // ServerRequest serverRequest = new ServerRequest(null); // Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.theme.render; -import org.jboss.portal.theme.render.DecorationRenderer; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.DecorationRenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; import java.io.PrintWriter; @@ -35,9 +35,9 @@ public class TestDecorationRenderer implements DecorationRenderer { - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException { - PrintWriter writer = renderContext.getWriter(); + PrintWriter writer = rendererContext.getWriter(); writer.print("<div class=\"test-decoration\">Decoration</div>"); } } Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestPortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.theme.render; -import org.jboss.portal.theme.render.PortletRenderer; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; import org.jboss.portal.theme.render.RenderException; import java.io.PrintWriter; @@ -35,9 +35,9 @@ public class TestPortletRenderer implements PortletRenderer { - public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException + public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - PrintWriter writer = renderContext.getWriter(); + PrintWriter writer = rendererContext.getWriter(); writer.print("<div class=\"test-portlet\">"); writer.print(prc.getMarkup()); writer.print("</div>"); Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.theme.render; -import org.jboss.portal.theme.render.RegionRenderer; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.RegionRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.util.Iterator; import java.io.PrintWriter; @@ -38,24 +38,24 @@ implements RegionRenderer { - public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - PrintWriter writer = renderContext.getWriter(); + PrintWriter writer = rendererContext.getWriter(); writer.print("<div class=\"test-region\">"); } - public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - PrintWriter writer = renderContext.getWriter(); + PrintWriter writer = rendererContext.getWriter(); writer.print("</div>"); } - public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderBody(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { for (Iterator i = rrc.getWindows().iterator(); i.hasNext();) { - WindowRenderContext wrc = (WindowRenderContext)i.next(); - renderContext.render(wrc); + WindowRendererContext wrc = (WindowRendererContext)i.next(); + rendererContext.render(wrc); } } } Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.theme.render; -import org.jboss.portal.theme.render.WindowRenderer; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import org.jboss.portal.theme.render.RenderException; import java.io.PrintWriter; @@ -34,12 +34,12 @@ */ public class TestWindowRenderer implements WindowRenderer { - public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException + public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - PrintWriter writer = renderContext.getWriter(); + PrintWriter writer = rendererContext.getWriter(); writer.print("<div class=\"test-window\">"); - renderContext.render(wrc.getDecoration()); - renderContext.render(wrc.getPortlet()); + rendererContext.render(wrc.getDecoration()); + rendererContext.render(wrc.getPortlet()); writer.print("</div>"); } } Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -30,6 +30,7 @@ import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.RuntimeContext; import org.jboss.portal.theme.ServerRegistrationID; +import org.jboss.portal.theme.PortalRenderSet; import org.jboss.portal.theme.deployment.jboss.PortalLayoutMetaDataFactory; import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory; import org.jboss.portal.theme.impl.LayoutServiceImpl; @@ -47,7 +48,6 @@ import org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer; import org.jboss.portal.theme.metadata.PortalLayoutMetaData; import org.jboss.portal.theme.metadata.RenderSetMetaData; -import org.jboss.portal.theme.render.PortalRenderSet; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -34,6 +34,7 @@ import org.jboss.portal.theme.RuntimeContext; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; +import org.jboss.portal.theme.PortalRenderSet; import org.jboss.portal.theme.deployment.jboss.PortalLayoutMetaDataFactory; import org.jboss.portal.theme.deployment.jboss.PortalThemeMetaDataFactory; import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory; @@ -46,7 +47,6 @@ import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.render.PortalRenderSet; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -141,7 +141,6 @@ // pageresult obj PageResult pageResult = new PageResult(TEST_PAGE_NAME, pageProps, portalProps); - pageResult.setTheme(theme); // create window ctx/results and add to page result for (int i = 0; i < LEFT_WINDOWS; i++) Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,127 +23,10 @@ package org.jboss.portal.test.theme.tmp.servlet; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.portal.common.util.MediaType; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.theme.LayoutService; -import org.jboss.portal.theme.PortalLayout; -import org.jboss.portal.theme.PortalTheme; -import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.theme.ThemeService; -import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.render.PortalRenderSet; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; /** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */ public class TestThemeServlet extends HttpServlet { - - - private static final String TEST_PAGE_NAME = "TestPage"; - - /** How many windows to create on left region * */ - private static final int LEFT_WINDOWS = 3; - - /** How many windows to create on center region * */ - private static final int CENTER_WINDOWS = 3; - - /** - * Generates a portal page with windows, using the theme api. - */ - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - try - { - proceed(request, response); - } - catch (Exception e) - { - throw new ServletException(e); - } - } - - public void proceed(HttpServletRequest request, HttpServletResponse response) throws Exception - { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - - LayoutService layoutService = (LayoutService)MBeanProxy.get(LayoutService.class, new ObjectName("portal:service=LayoutService"), mbeanServer); - ThemeService themeService = (ThemeService)MBeanProxy.get(ThemeService.class, new ObjectName("portal:service=ThemeService"), mbeanServer); - PageService pageService = (PageService)MBeanProxy.get(PageService.class, new ObjectName("portal:service=PageService"), mbeanServer); - - PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer", MediaType.HTML); - PortalLayout layout = layoutService.getLayout("generic", true); - PortalTheme theme = themeService.getTheme("renaissance", true); - - - // - Map pageProps = new HashMap(); - pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax"); - pageProps.put(DynaConstants.ASYNC_SERVER_URL, "http://localhost:8080/portal-ajax/ajax"); - - // - Map portalProps = new HashMap(); - portalProps.put(ThemeConstants.PORTAL_PROP_RENDERSET, renderSet.getName()); - - // - MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "utf-8"); - ServerRequest serverRequest = new ServerRequest(null); - - // pageresult obj - PageResult pageResult = new PageResult(TEST_PAGE_NAME, pageProps, portalProps); - pageResult.setTheme(theme); - - // create window ctx/results and add to page result - for (int i = 0; i < LEFT_WINDOWS; i++) - { - WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_" + i, "left", i, createWindowMarkup("WindowA_" + i + " Title", "<p>WindowA_" + i + " Content</p>")); - pageResult.addWindowContext(wCtx); - } - for (int i = 0; i < CENTER_WINDOWS; i++) - { - WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_" + i, "center", i, createWindowMarkup("WindowB_" + i + " Title", "<p>WindowB_" + i + " Content</p>")); - pageResult.addWindowContext(wCtx); - } - - // set the renderctx and req/res attr -// RenderContext renderCtx = new RenderContext(layout, markupInfo, pageResult); -// response.setContentType(renderCtx.getContentType().toString()); -// response.setCharacterEncoding(renderCtx.getCharset()); -// request.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, renderCtx); -// request.setAttribute(LayoutConstants.ATTR_PAGE, pageResult); -// request.setAttribute(ThemeConstants.ATTR_THEME, theme); - - // -// LayoutDispatcher dispatcher1 = new LayoutDispatcher(renderCtx, request, response, pageResult); -// dispatcher1.include(); - } - - /** - * Generates the WindowResult for our windowcontext - * - * @param sTitle - * @param sContent - * @return window markup result - */ - private WindowResult createWindowMarkup(String sTitle, String sContent) - { - return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null, null); - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,8 +23,8 @@ package org.jboss.portal.theme; import org.jboss.portal.server.servlet.FilterCommand; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.PageRenderContext; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; import org.jboss.portal.web.ServletContextDispatcher; import org.jboss.portal.web.RequestDispatchCallback; @@ -47,18 +47,18 @@ public final class LayoutDispatcher implements RequestDispatchCallback { - private final PageRenderContext markupResult; - private final RenderContext renderContext; + private final PageRendererContext markupResult; + private final RendererContext rendererContext; private final String layoutURI; private final LayoutInfo layoutInfo; /** - * @param renderContext + * @param rendererContext * @throws IllegalArgumentException if the layout is null */ public LayoutDispatcher( - RenderContext renderContext, - PageRenderContext result, + RendererContext rendererContext, + PageRendererContext result, String layoutURI, LayoutInfo layoutInfo) throws IllegalArgumentException @@ -69,7 +69,7 @@ throw new IllegalArgumentException("No null response allowed here"); } - if (renderContext == null) + if (rendererContext == null) { throw new IllegalArgumentException("No render context provided"); } @@ -79,7 +79,7 @@ } this.markupResult = result; - this.renderContext = renderContext; + this.rendererContext = rendererContext; this.layoutURI = layoutURI; this.layoutInfo = layoutInfo; } @@ -88,7 +88,7 @@ { try { - ServletContextDispatcher dispatcher = renderContext.getDispatcher(); + ServletContextDispatcher dispatcher = rendererContext.getDispatcher(); dispatcher.include(layoutInfo.getServletContext(), this, null); } catch (Exception e) @@ -102,14 +102,14 @@ try { // Set charset and content type on the response - dispatchedResponse.setContentType(renderContext.getContentType().toString()); - dispatchedResponse.setCharacterEncoding(renderContext.getCharset()); + dispatchedResponse.setContentType(rendererContext.getContentType().toString()); + dispatchedResponse.setCharacterEncoding(rendererContext.getCharset()); // RequestDispatcher dispatcher = dispatchedServletContext.getRequestDispatcher(layoutURI); // - dispatchedRequest.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, renderContext); + dispatchedRequest.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, rendererContext); dispatchedRequest.setAttribute(FilterCommand.REQ_ATT_KEY, this); dispatchedRequest.setAttribute(LayoutConstants.ATTR_PAGE, markupResult); Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -25,8 +25,7 @@ import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.ContentInfo; -import org.jboss.portal.theme.render.PortalRenderSet; -import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.PortalRenderSet; import java.util.Collection; Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,10 +22,9 @@ ******************************************************************************/ package org.jboss.portal.theme; -import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.PageRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; import java.io.Writer; @@ -72,19 +71,28 @@ * Provides a render context that will render its markup in the response provided by the servlet context * dispatcher. * - * @param markupInfo - * @param dispatcher - * @return + * @param themeContext the theme context + * @param markupInfo the markup info + * @param dispatcher the way to dispatch to the layout and receive the produced markup + * @return a render context */ - public abstract RenderContext getRenderContext(MarkupInfo markupInfo, ServletContextDispatcher dispatcher); + public abstract RendererContext getRenderContext( + ThemeContext themeContext, + MarkupInfo markupInfo, + ServletContextDispatcher dispatcher); /** * Provides a render context that will render its markup in the provided writer. * - * @param markupInfo - * @param dispatcher - * @param writer - * @return + * @param themeContext the theme context + * @param markupInfo the markup info + * @param dispatcher the way to dispatch to the layout + * @param writer the writer that will receive the produced markup + * @return a render context */ - public abstract RenderContext getRenderContext(MarkupInfo markupInfo, ServletContextDispatcher dispatcher, Writer writer); + public abstract RendererContext getRenderContext( + ThemeContext themeContext, + MarkupInfo markupInfo, + ServletContextDispatcher dispatcher, + Writer writer); } Copied: trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,191 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme; + +import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.theme.RuntimeContext; +import org.jboss.portal.theme.ServerRegistrationID; +import org.jboss.portal.theme.render.renderer.ObjectRenderer; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.impl.render.dynamic.DynaDecorationRenderer; +import org.jboss.portal.theme.impl.render.dynamic.DynaPortletRenderer; +import org.jboss.portal.theme.impl.render.dynamic.DynaRegionRenderer; +import org.jboss.portal.theme.impl.render.dynamic.DynaWindowRenderer; +import org.jboss.portal.theme.metadata.RendererSetMetaData; + +/** + * The portal render set is a set of renderer implementations for the markup container of a page. <p>A render set + * consists of 4 iterface implementations with some meta data describing the web application the render set is coming + * from, and the content type it is capable of handling.</p> + * + * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a>. + * @version <tt>$Revision$</tt> + */ +public final class PortalRenderSet +{ + + private final RegionRenderer regionRenderer; + private final WindowRenderer windowRenderer; + private final PortletRenderer portletRenderer; + private final DecorationRenderer decorationRenderer; + private final MediaType contentType; + private final String appID; + private final String name; + private final ServerRegistrationID registrationId; + private final boolean ajaxEnabled; + + /** + * construct a render set + * + * @param renderSetName the name of the render set as defined in the portal-renderSet.xml descriptor, or null if it + * was defined as part of a layout descriptor. + * @param runtimeContext the runtime environment (data describing the portal web application in wich the render set + * was defined) + * @param rendererSetMD meta data about an individual set of 4 renderer implementation together with their supported + * content type + * @throws IllegalAccessException + * @throws InstantiationException + * @throws ClassNotFoundException + */ + public PortalRenderSet(String renderSetName, RuntimeContext runtimeContext, RendererSetMetaData rendererSetMD) throws IllegalAccessException, InstantiationException, ClassNotFoundException + { + // there CAN be render sets without a name ! + + if (runtimeContext == null) + { + throw new IllegalArgumentException("no valid container"); + } + if (rendererSetMD == null) + { + throw new IllegalArgumentException("no valid set"); + } + this.name = renderSetName; + this.appID = runtimeContext.getAppId(); + this.registrationId = ServerRegistrationID.createID(ServerRegistrationID.TYPE_RENDERSET, new String[]{appID, name}); + this.contentType = rendererSetMD.getContentType(); + this.ajaxEnabled = rendererSetMD.isAjaxEnabled(); + + if (ajaxEnabled) // wrap the current renderer with the ajax delegator one. + { + this.regionRenderer = new DynaRegionRenderer((RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer())); + this.windowRenderer = new DynaWindowRenderer((WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer())); + this.portletRenderer = new DynaPortletRenderer((PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer())); + this.decorationRenderer = new DynaDecorationRenderer((DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer())); + } + else + { + this.regionRenderer = (RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer()); + this.windowRenderer = (WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer()); + this.portletRenderer = (PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer()); + this.decorationRenderer = (DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer()); + } + } + + public ServerRegistrationID getRegistrationId() + { + return registrationId; + } + + /** + * @see PortalRenderSet#getMediaType + */ + public MediaType getMediaType() + { + return contentType; + } + + /** + * Get the name of the application (the WAR) that contains this render set. + * + * @return the name of the application (the WAR) that contains this render set + */ + public String getAppId() + { + return appID; + } + + /** + * Get the name of this render set. + * + * @return the name of this render set + */ + public String getName() + { + return name; + } + + /** + * @see PortalRenderSet#getRegionRenderer + */ + public RegionRenderer getRegionRenderer() + { + return regionRenderer; + } + + /** + * @see PortalRenderSet#getWindowRenderer + */ + public WindowRenderer getWindowRenderer() + { + return windowRenderer; + } + + /** + * @see PortalRenderSet#getPortletRenderer + */ + public PortletRenderer getPortletRenderer() + { + return portletRenderer; + } + + /** + * @see PortalRenderSet#getDecorationRenderer + */ + public DecorationRenderer getDecorationRenderer() + { + return decorationRenderer; + } + + public boolean isAjaxEnabled() + { + return ajaxEnabled; + } + + /** + * @see java.lang.Object#toString + */ + public String toString() + { + return "PortalRenderSet: " + getAppId() + "." + (getName() == null ? "<from layout>" : getName()) + ": " + + getMediaType() + " [" + getRegionRenderer() + "][" + getWindowRenderer() + "][" + getDecorationRenderer() + + "][" + getPortletRenderer() + "]"; + } + + private ObjectRenderer loadRenderer(ClassLoader loader, String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException + { + return (ObjectRenderer)loader.loadClass(className).newInstance(); + } +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -33,7 +33,7 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.ObjectRenderer + * @see org.jboss.portal.theme.render.renderer.ObjectRenderer * @see org.jboss.portal.theme.PortalLayout */ public abstract class PortalTheme Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -30,22 +30,16 @@ */ public final class ThemeConstants { + private ThemeConstants() { } - /** Request attribute to propagate the current portal theme in the request */ - public static final String ATTR_THEME = "THEME"; - - /** Request attribute to propagate the theme service */ - public static final String ATTR_THEME_SERVER = "THEMESERVER"; - // Portal property keys /** Key name to access the selected layout for the portal or page (via the portal or page properties) */ public static final String PORTAL_PROP_LAYOUT = "layout.id"; - /** Key name to access the selected theme for the portal or page (via the portal or page properties) */ public static final String PORTAL_PROP_THEME = "theme.id"; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -28,11 +28,12 @@ import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.PageRenderContext; -import org.jboss.portal.theme.render.PageRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; +import org.jboss.portal.theme.render.renderer.PageRenderer; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.RendererFactory; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.WindowState; import org.jboss.portal.web.ServletContextDispatcher; import org.jboss.portal.common.util.MarkupInfo; @@ -53,24 +54,24 @@ public final class JSPLayout extends PortalLayout implements PageRenderer { - public RenderContext getRenderContext(MarkupInfo markupInfo, ServletContextDispatcher dispatcher) + public RendererContext getRenderContext(ThemeContext themeContext, MarkupInfo markupInfo, ServletContextDispatcher dispatcher) { RendererFactory factory = new RendererFactoryImpl(this, serviceInfo, info); // - return new JSPRenderContext(factory, dispatcher, markupInfo); + return new JSPRendererContext(themeContext, factory, dispatcher, markupInfo); } - public RenderContext getRenderContext(MarkupInfo markupInfo, ServletContextDispatcher dispatcher, Writer writer) + public RendererContext getRenderContext(ThemeContext themeContext, MarkupInfo markupInfo, ServletContextDispatcher dispatcher, Writer writer) { RendererFactory factory = new RendererFactoryImpl(this, serviceInfo, info); // - return new WriterRenderContext(factory, dispatcher, markupInfo, new PrintWriter(writer)); + return new WriterRendererContext(themeContext, factory, dispatcher, markupInfo, new PrintWriter(writer)); } - public void render(RenderContext renderContext, PageRenderContext prc) throws RenderException + public void render(RendererContext rendererContext, PageRendererContext prc) throws RenderException { PageResult pageResult = (PageResult)prc; @@ -128,7 +129,7 @@ { String layoutState = pageResult.getLayoutState(); String layoutURI = getLayoutInfo().getURI(layoutState); - LayoutDispatcher dispatcher = new LayoutDispatcher(renderContext, prc, layoutURI, getLayoutInfo()); + LayoutDispatcher dispatcher = new LayoutDispatcher(rendererContext, prc, layoutURI, getLayoutInfo()); dispatcher.include(); } catch (IOException e) Deleted: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,63 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.impl; - -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.ObjectRenderContext; -import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; - -import java.io.PrintWriter; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class JSPRenderContext extends RenderContext -{ - - /** The writer provided by the JSP tag lib, the tag lib will flush the writer at the right time. */ - private PrintWriter writer; - - public JSPRenderContext(RendererFactory rendererFactory, ServletContextDispatcher dispatcher, MarkupInfo markupInfo) - { - super(rendererFactory, dispatcher, markupInfo); - } - - public PrintWriter getWriter() - { - return writer; - } - - public void setWriter(PrintWriter writer) - { - this.writer = writer; - } - - public void render(ObjectRenderContext ctx) throws RenderException, IllegalStateException - { - super.render(ctx); - } -} Copied: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,68 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.impl; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RendererFactory; +import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ThemeContext; +import org.jboss.portal.web.ServletContextDispatcher; +import org.jboss.portal.common.util.MarkupInfo; + +import java.io.PrintWriter; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class JSPRendererContext extends RendererContext +{ + + /** The writer provided by the JSP tag lib, the tag lib will flush the writer at the right time. */ + private PrintWriter writer; + + public JSPRendererContext( + ThemeContext themeContext, + RendererFactory rendererFactory, + ServletContextDispatcher dispatcher, + MarkupInfo markupInfo) + { + super(themeContext, rendererFactory, dispatcher, markupInfo); + } + + public PrintWriter getWriter() + { + return writer; + } + + public void setWriter(PrintWriter writer) + { + this.writer = writer; + } + + public void render(ObjectRendererContext ctx) throws RenderException, IllegalStateException + { + super.render(ctx); + } +} Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -32,10 +32,10 @@ import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.RuntimeContext; import org.jboss.portal.theme.ServerRegistrationID; +import org.jboss.portal.theme.PortalRenderSet; import org.jboss.portal.theme.metadata.PortalLayoutMetaData; import org.jboss.portal.theme.metadata.RenderSetMetaData; import org.jboss.portal.theme.metadata.RendererSetMetaData; -import org.jboss.portal.theme.render.PortalRenderSet; import org.jboss.system.Service; import java.util.ArrayList; @@ -56,33 +56,35 @@ * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a>. * @version <tt>$Revision$</tt> * @see org.jboss.portal.theme.PortalLayout - * @see org.jboss.portal.theme.render.PortalRenderSet + * @see org.jboss.portal.theme.PortalRenderSet * @see MediaType */ public class LayoutServiceImpl extends AbstractJBossService implements LayoutService, Service { private static Logger log = Logger.getLogger(LayoutServiceImpl.class); - // map of layout id to layout + /** Map of layout id to layout. */ private Map layouts; - // map of layout name to layout id + /** Map of layout name to layout id. */ private Map layoutNames; - // map of appID + "." + layout name to layout id + /** Map of appID + "." + layout name to layout id. */ private Map exactLayoutNames; - // map of renderSet registration id to list of rendersets + /** Map of renderSet registration id to list of rendersets. */ private Map renderSets; - // map of render set name to render set + /** Map of render set name to render set. */ private Map renderSetNames; - // map of appID + "." + render set name to render set + /** Map of appID + "." + render set name to render set. */ private Map exactRenderSetNames; + /** . */ private PortalLayout defaultLayout; + /** . */ private String defaultName; public LayoutServiceImpl() Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,16 +23,16 @@ package org.jboss.portal.theme.impl; import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.ObjectRenderer; -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.ObjectRenderContext; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.render.PortletRenderContext; -import org.jboss.portal.theme.render.DecorationRenderContext; -import org.jboss.portal.theme.render.PortalRenderSet; -import org.jboss.portal.theme.render.PageRenderContext; -import org.jboss.portal.theme.render.PageRenderer; +import org.jboss.portal.theme.render.renderer.ObjectRenderer; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; +import org.jboss.portal.theme.render.renderer.PageRenderer; +import org.jboss.portal.theme.render.renderer.PageRendererContext; +import org.jboss.portal.theme.PortalRenderSet; import org.jboss.portal.theme.LayoutServiceInfo; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.LayoutInfo; @@ -64,34 +64,34 @@ this.layoutInfo = layoutInfo; } - public ObjectRenderer getRenderer(RenderContext renderContext, ObjectRenderContext objectRenderContext) + public ObjectRenderer getRenderer(RendererContext rendererContext, ObjectRendererContext objectRendererContext) { - if (objectRenderContext instanceof PageRenderContext) + if (objectRendererContext instanceof PageRendererContext) { return pageRenderer; } - if (objectRenderContext instanceof RegionRenderContext) + if (objectRendererContext instanceof RegionRendererContext) { - return getRegionRenderer(renderContext, (RegionRenderContext)objectRenderContext); + return getRegionRenderer(rendererContext, (RegionRendererContext)objectRendererContext); } - else if (objectRenderContext instanceof WindowRenderContext) + else if (objectRendererContext instanceof WindowRendererContext) { - return getWindowRenderer(renderContext, (WindowRenderContext)objectRenderContext); + return getWindowRenderer(rendererContext, (WindowRendererContext)objectRendererContext); } - else if (objectRenderContext instanceof PortletRenderContext) + else if (objectRendererContext instanceof PortletRendererContext) { - return getPortletRenderer(renderContext, (PortletRenderContext)objectRenderContext); + return getPortletRenderer(rendererContext, (PortletRendererContext)objectRendererContext); } - else if (objectRenderContext instanceof DecorationRenderContext) + else if (objectRendererContext instanceof DecorationRendererContext) { - return getDecorationRenderer(renderContext, (DecorationRenderContext)objectRenderContext); + return getDecorationRenderer(rendererContext, (DecorationRendererContext)objectRendererContext); } return null; } - private ObjectRenderer getRegionRenderer(RenderContext renderContext, RegionRenderContext objectRenderContext) + private ObjectRenderer getRegionRenderer(RendererContext rendererContext, RegionRendererContext objectRenderContext) { - return getRenderSet(renderContext).getRegionRenderer(); + return getRenderSet(rendererContext).getRegionRenderer(); } /** @@ -103,7 +103,7 @@ * name for the window renderer to use * @return a window renderer */ - public ObjectRenderer getWindowRenderer(RenderContext renderContext, WindowRenderContext result) + public ObjectRenderer getWindowRenderer(RendererContext rendererContext, WindowRendererContext result) { String renderSetName = null; if (result != null) @@ -114,13 +114,13 @@ // if (result != null && renderSetName == null) { - renderSetName = renderContext.getProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER); + renderSetName = rendererContext.getProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER); } // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, renderContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); // if (renderSet != null) @@ -130,7 +130,7 @@ } // - return getRenderSet(renderContext).getWindowRenderer(); + return getRenderSet(rendererContext).getWindowRenderer(); } /** @@ -142,7 +142,7 @@ * name for the decoration renderer to use * @return a decoration renderer */ - public ObjectRenderer getDecorationRenderer(RenderContext renderContext, DecorationRenderContext result) + public ObjectRenderer getDecorationRenderer(RendererContext rendererContext, DecorationRendererContext result) { String renderSetName = null; @@ -154,13 +154,13 @@ // if (result != null && renderSetName == null) { - renderSetName = renderContext.getProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER); + renderSetName = rendererContext.getProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER); } // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, renderContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); // if (renderSet != null) @@ -170,7 +170,7 @@ } // - return getRenderSet(renderContext).getDecorationRenderer(); + return getRenderSet(rendererContext).getDecorationRenderer(); } /** @@ -182,7 +182,7 @@ * portlet renderer from * @return a portlet renderer */ - public ObjectRenderer getPortletRenderer(RenderContext renderContext, PortletRenderContext result) + public ObjectRenderer getPortletRenderer(RendererContext rendererContext, PortletRendererContext result) { String renderSetName = null; @@ -195,13 +195,13 @@ // if (result != null && renderSetName == null) { - renderSetName = renderContext.getProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER); + renderSetName = rendererContext.getProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER); } // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, renderContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); // if (renderSet != null) @@ -211,20 +211,20 @@ } // - return getRenderSet(renderContext).getPortletRenderer(); + return getRenderSet(rendererContext).getPortletRenderer(); } - private PortalRenderSet getRenderSet(RenderContext renderContext) + private PortalRenderSet getRenderSet(RendererContext rendererContext) { // Find the render set name - String renderSetName = renderContext.getProperty(ThemeConstants.PORTAL_PROP_RENDERSET); + String renderSetName = rendererContext.getProperty(ThemeConstants.PORTAL_PROP_RENDERSET); // if (renderSetName == null) // { // throw new IllegalArgumentException("No RenderSet determined"); // } - ContentInfo contentInfo = renderContext.getMarkupInfo(); + ContentInfo contentInfo = rendererContext.getMarkupInfo(); return layoutServiceInfo.getRenderSet(layoutInfo, contentInfo, renderSetName); // if (renderSet == null) Deleted: trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,68 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.impl; - -import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.RendererFactory; -import org.jboss.portal.theme.render.ObjectRenderContext; -import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; - -import java.io.PrintWriter; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class WriterRenderContext extends RenderContext -{ - - /** The provided writer by the caller of the rendering process. */ - private final PrintWriter writer; - - public WriterRenderContext( - RendererFactory rendererFactory, - ServletContextDispatcher dispatcher, - MarkupInfo markupInfo, - PrintWriter writer) - { - super(rendererFactory, dispatcher, markupInfo); - - // - this.writer = writer; - } - - public PrintWriter getWriter() - { - return writer; - } - - public void render(ObjectRenderContext ctx) throws RenderException, IllegalStateException - { - super.render(ctx); - - // - writer.flush(); - } -} Copied: trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.impl; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RendererFactory; +import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ThemeContext; +import org.jboss.portal.web.ServletContextDispatcher; +import org.jboss.portal.common.util.MarkupInfo; + +import java.io.PrintWriter; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class WriterRendererContext extends RendererContext +{ + + /** The provided writer by the caller of the rendering process. */ + private final PrintWriter writer; + + public WriterRendererContext( + ThemeContext themeContext, + RendererFactory rendererFactory, + ServletContextDispatcher dispatcher, + MarkupInfo markupInfo, + PrintWriter writer) + { + super(themeContext, rendererFactory, dispatcher, markupInfo); + + // + this.writer = writer; + } + + public PrintWriter getWriter() + { + return writer; + } + + public void render(ObjectRendererContext ctx) throws RenderException, IllegalStateException + { + super.render(ctx); + + // + writer.flush(); + } +} Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -24,11 +24,11 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.theme.render.DecorationRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.DecorationRenderContext; -import org.jboss.portal.theme.render.ActionRenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; +import org.jboss.portal.theme.render.renderer.ActionRendererContext; import java.util.Collection; import java.util.Collections; @@ -44,23 +44,23 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.DecorationRenderer + * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ public class DivDecorationRenderer implements DecorationRenderer { - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException { - PrintWriter markup = renderContext.getWriter(); - renderTitle(renderContext, drc); + PrintWriter markup = rendererContext.getWriter(); + renderTitle(rendererContext, drc); markup.print("<div class=\"portlet-mode-container\">"); - renderModeAndStateLinks(renderContext, drc, ActionRenderContext.MODES_KEY); - renderModeAndStateLinks(renderContext, drc, ActionRenderContext.WINDOWSTATES_KEY); + renderModeAndStateLinks(rendererContext, drc, ActionRendererContext.MODES_KEY); + renderModeAndStateLinks(rendererContext, drc, ActionRendererContext.WINDOWSTATES_KEY); markup.print("</div>"); } - private static void renderTitle(RenderContext ctx, DecorationRenderContext drc) + private static void renderTitle(RendererContext ctx, DecorationRendererContext drc) { PrintWriter out = ctx.getWriter(); out.print("<div class=\"portlet-titlebar-decoration\">"); @@ -69,7 +69,7 @@ out.print("</span></div>"); } - private static void renderModeAndStateLinks(RenderContext ctx, DecorationRenderContext drc, String selector) + private static void renderModeAndStateLinks(RendererContext ctx, DecorationRendererContext drc, String selector) { Collection modesOrStates = drc.getTriggerableActions(selector); if (modesOrStates == null) @@ -86,7 +86,7 @@ for (Iterator i = modesOrStates.iterator(); i.hasNext();) { - ActionRenderContext action = (ActionRenderContext)i.next(); + ActionRendererContext action = (ActionRendererContext)i.next(); if (action.isEnabled()) { PrintWriter out = ctx.getWriter(); @@ -122,8 +122,8 @@ public int compare(Object o1, Object o2) { - ActionRenderContext action1 = (ActionRenderContext)o1; - ActionRenderContext action2 = (ActionRenderContext)o2; + ActionRendererContext action1 = (ActionRendererContext)o1; + ActionRendererContext action2 = (ActionRendererContext)o2; Object origin1 = action1.getFamily(); Object origin2 = action2.getFamily(); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.portal.theme.render.PortletRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; import java.io.PrintWriter; @@ -34,13 +34,13 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortletRenderer + * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ public class DivPortletRenderer implements PortletRenderer { - public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException + public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - PrintWriter out = renderContext.getWriter(); + PrintWriter out = rendererContext.getWriter(); out.print(prc.getMarkup()); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.portal.theme.render.RegionRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.util.Iterator; import java.io.PrintWriter; @@ -37,15 +37,15 @@ * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @author <a href="mailto:roy@jboss.org>Roy Russo</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.RegionRenderer + * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ public class DivRegionRenderer implements RegionRenderer { - public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - PrintWriter markup = renderContext.getWriter(); + PrintWriter markup = rendererContext.getWriter(); markup.print("<div"); if (rrc == null) // || region.getWindows().size() <= 0) @@ -60,18 +60,18 @@ } } - public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderBody(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { for (Iterator i = rrc.getWindows().iterator(); i.hasNext();) { - WindowRenderContext wrc = (WindowRenderContext)i.next(); - renderContext.render(wrc); + WindowRendererContext wrc = (WindowRendererContext)i.next(); + rendererContext.render(wrc); } } - public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - PrintWriter markup = renderContext.getWriter(); + PrintWriter markup = rendererContext.getWriter(); markup.print("</div>"); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.WindowRenderer; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.io.PrintWriter; @@ -34,27 +34,27 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.WindowRenderer + * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ public class DivWindowRenderer implements WindowRenderer { - public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException + public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - PrintWriter out = renderContext.getWriter(); + PrintWriter out = rendererContext.getWriter(); out.print("<div class=\"portlet-container\">"); out.print("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"); // out.print("<tr><td class=\"portlet-titlebar-left\"></td>"); out.print("<td class=\"portlet-titlebar-center\">"); - renderContext.render(wrc.getDecoration()); + rendererContext.render(wrc.getDecoration()); out.print("</td><td class=\"portlet-titlebar-right\"></td></tr>"); // out.print("<tr><td class=\"portlet-content-left\"></td>"); out.print("<td class=\"portlet-body\"><div class=\"portlet-content-center\">"); - renderContext.render(wrc.getPortlet()); + rendererContext.render(wrc.getPortlet()); out.print("</div></td><td class=\"portlet-content-right\"></td></tr>"); // Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.render.DecorationRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.DecorationRenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import java.io.PrintWriter; @@ -35,7 +35,7 @@ * @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a> * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.DecorationRenderer + * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ public class DynaDecorationRenderer implements DecorationRenderer { @@ -49,23 +49,23 @@ delegate = decorationRenderer; } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException { - switch(DynaStatus.get(renderContext)) + switch(DynaStatus.get(rendererContext)) { case DynaStatus.DYNA_RENDERED_VALUE: DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // - PrintWriter markup = renderContext.getWriter(); + PrintWriter markup = rendererContext.getWriter(); markup.print("<div class=\"dyna-decoration\">\n"); markup.print("<div class=\"handle\">"); - delegate.render(renderContext, drc); + delegate.render(rendererContext, drc); markup.print("</div>\n"); markup.print("</div>\n"); break; case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.render(renderContext, drc); + delegate.render(rendererContext, drc); break; } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,10 +23,10 @@ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.render.PortletRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; import java.io.PrintWriter; @@ -36,7 +36,7 @@ * @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a> * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortletRenderer + * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ public class DynaPortletRenderer implements PortletRenderer { @@ -50,15 +50,15 @@ delegate = portletRenderer; } - /** @see PortletRenderer#render */ - public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException + /** @see org.jboss.portal.theme.render.renderer.PortletRenderer#render */ + public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - doDND(renderContext, prc); + doDND(rendererContext, prc); } - private void doDND(RenderContext renderContext, PortletRenderContext prc) throws RenderException + private void doDND(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - switch(DynaStatus.get(renderContext)) + switch(DynaStatus.get(rendererContext)) { case DynaStatus.DYNA_RENDERED_VALUE: // Provide handle on content if needed @@ -70,32 +70,32 @@ // // StringBuffer out = renderContext.getMarkupFragment(); // out.append("<span class=\"handle\">"); - doCatchClicks(renderContext, prc); + doCatchClicks(rendererContext, prc); // out.append("</span>"); } else { - doCatchClicks(renderContext, prc); + doCatchClicks(rendererContext, prc); } break; case DynaStatus.CLASSIC_RENDERED_VALUE: - doCatchClicks(renderContext, prc); + doCatchClicks(rendererContext, prc); break; } } - private void doCatchClicks(RenderContext renderContext, PortletRenderContext prc) throws RenderException + private void doCatchClicks(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - switch(DynaStatus.get(renderContext)) + switch(DynaStatus.get(rendererContext)) { case DynaStatus.DYNA_RENDERED_VALUE: - PrintWriter out = renderContext.getWriter(); + PrintWriter out = rendererContext.getWriter(); out.print("<div class=\"dyna-portlet\">"); - delegate.render(renderContext, prc); + delegate.render(rendererContext, prc); out.print("</div>"); break; case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.render(renderContext, prc); + delegate.render(rendererContext, prc); break; } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -45,10 +45,10 @@ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.render.RegionRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.RegionRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; import java.io.PrintWriter; @@ -57,7 +57,7 @@ * * @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a> * @author <a href="mailto:roy@jboss.org">Roy Russo</a> - * @see org.jboss.portal.theme.render.RegionRenderer + * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ public class DynaRegionRenderer implements RegionRenderer { @@ -72,15 +72,15 @@ delegate = regionRenderer; } - public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - PrintWriter markup = renderContext.getWriter(); - String jsBase = renderContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); - String asyncServerURL = renderContext.getProperty(DynaConstants.ASYNC_SERVER_URL); - String viewState = renderContext.getProperty(DynaConstants.VIEW_STATE); + PrintWriter markup = rendererContext.getWriter(); + String jsBase = rendererContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); + String asyncServerURL = rendererContext.getProperty(DynaConstants.ASYNC_SERVER_URL); + String viewState = rendererContext.getProperty(DynaConstants.VIEW_STATE); // - Object onPage = renderContext.getProperty(DynaConstants.OBJECT_ENABLED); + Object onPage = rendererContext.getProperty(DynaConstants.OBJECT_ENABLED); boolean pageEnabled = onPage != null && "true".equals(onPage); // @@ -152,13 +152,13 @@ } // - renderContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, new Integer(status)); + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, new Integer(status)); // switch(status) { case DynaStatus.DYNA_RENDERED_VALUE: - delegate.renderHeader(renderContext, rrc); + delegate.renderHeader(rendererContext, rrc); // We need height and width otherwise the region will not be usable when empty markup.print("<div class=\"dyna-region\" id=\""); @@ -166,30 +166,30 @@ markup.print("\">"); break; case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderHeader(renderContext, rrc); + delegate.renderHeader(rendererContext, rrc); break; case DynaStatus.NOT_RENDERED_VALUE: break; } } - public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - int status = DynaStatus.get(renderContext); + int status = DynaStatus.get(rendererContext); // - renderContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, null); + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, null); // switch(status) { case DynaStatus.DYNA_RENDERED_VALUE: - PrintWriter markup = renderContext.getWriter(); + PrintWriter markup = rendererContext.getWriter(); markup.print("</div>"); - delegate.renderFooter(renderContext, rrc); + delegate.renderFooter(rendererContext, rrc); break; case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderFooter(renderContext, rrc); + delegate.renderFooter(rendererContext, rrc); break; case DynaStatus.NOT_RENDERED_VALUE: break; @@ -197,17 +197,17 @@ } /** - * @see RegionRenderer#renderBody + * @see org.jboss.portal.theme.render.renderer.RegionRenderer#renderBody */ - public void renderBody(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException + public void renderBody(RendererContext rendererContext, final RegionRendererContext rrc) throws RenderException { - switch(DynaStatus.get(renderContext)) + switch(DynaStatus.get(rendererContext)) { case DynaStatus.DYNA_RENDERED_VALUE: - delegate.renderBody(renderContext, rrc); + delegate.renderBody(rendererContext, rrc); break; case DynaStatus.CLASSIC_RENDERED_VALUE: - delegate.renderBody(renderContext, rrc); + delegate.renderBody(rendererContext, rrc); break; case DynaStatus.NOT_RENDERED_VALUE: break; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaStatus.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -46,14 +46,14 @@ /** . */ public static final int NOT_RENDERED_VALUE = 4; - public static int get(RenderContext renderContext) + public static int get(RendererContext rendererContext) { - Integer status = (Integer)renderContext.getAttribute(DynaConstants.DYNA_RENDER_STATUS); + Integer status = (Integer)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_STATUS); return status != null ? status.intValue() : UNKNOWN_VALUE; } - public static void set(RenderContext renderContext, int status) + public static void set(RendererContext rendererContext, int status) { - renderContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, INTEGERS[status]); + rendererContext.setAttribute(DynaConstants.DYNA_RENDER_STATUS, INTEGERS[status]); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,10 +23,10 @@ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.WindowRenderer; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.io.PrintWriter; @@ -36,7 +36,7 @@ * @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a> * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.WindowRenderer + * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ public class DynaWindowRenderer implements WindowRenderer { @@ -53,21 +53,21 @@ delegate = windowRenderer; } - /** @see WindowRenderer#render */ - public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException + /** @see org.jboss.portal.theme.render.renderer.WindowRenderer#render */ + public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - switch(DynaStatus.get(renderContext)) + switch(DynaStatus.get(rendererContext)) { case DynaStatus.DYNA_RENDERED_VALUE: // For now we say we have no provided any handle so far for the window handleProvided.set(Boolean.FALSE); // - PrintWriter out = renderContext.getWriter(); + PrintWriter out = rendererContext.getWriter(); out.print("<div class=\"dyna-window\"><div id=\""); out.print(wrc.getId()); out.print("\"/>\n"); - delegate.render(renderContext, wrc); + delegate.render(rendererContext, wrc); out.print("</div></div>\n"); // @@ -77,7 +77,7 @@ handleProvided.set(null); // - delegate.render(renderContext, wrc); + delegate.render(rendererContext, wrc); break; } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,22 +22,22 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.empty; -import org.jboss.portal.theme.render.DecorationRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.DecorationRenderContext; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; /** * Implementation of a Decoration renderer that creates no markup. * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.DecorationRenderer + * @see org.jboss.portal.theme.render.renderer.DecorationRenderer */ public class EmptyDecorationRenderer implements DecorationRenderer { - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException { } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.empty; -import org.jboss.portal.theme.render.PortletRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; /** * Implementation of a Portlet renderer that create only the portlet content, no markup around it. * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortletRenderer + * @see org.jboss.portal.theme.render.renderer.PortletRenderer */ public class EmptyPortletRenderer implements PortletRenderer { - public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException + public void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException { - renderContext.getWriter().print(prc.getMarkup()); + rendererContext.getWriter().print(prc.getMarkup()); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,11 +23,11 @@ package org.jboss.portal.theme.impl.render.empty; import org.jboss.logging.Logger; -import org.jboss.portal.theme.render.RegionRenderer; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.util.Iterator; import java.util.Map; @@ -39,7 +39,7 @@ * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.RegionRenderer + * @see org.jboss.portal.theme.render.renderer.RegionRenderer */ public class EmptyRegionRenderer implements RegionRenderer @@ -47,33 +47,33 @@ private static Logger log = Logger.getLogger(EmptyRegionRenderer.class); - public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { } - public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { } /** @see RegionRenderer#renderBody */ - public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderBody(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { Map orderedItems = new TreeMap(); // for (Iterator i = rrc.getWindows().iterator(); i.hasNext();) { - WindowRenderContext window = (WindowRenderContext)i.next(); + WindowRendererContext window = (WindowRendererContext)i.next(); orderedItems.put(new Integer(window.getOrder()), window); } // for (Iterator i = orderedItems.values().iterator(); i.hasNext();) { - WindowRenderContext wrc = (WindowRenderContext)i.next(); - renderContext.render(wrc); + WindowRendererContext wrc = (WindowRendererContext)i.next(); + rendererContext.render(wrc); } } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,24 +22,22 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.empty; -import org.jboss.portal.WindowState; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.WindowRenderer; -import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; /** * Implementation of a Window renderer that creates no markup, and only passed control to the Portlet renderer. * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.WindowRenderer + * @see org.jboss.portal.theme.render.renderer.WindowRenderer */ public class EmptyWindowRenderer implements WindowRenderer { - public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException + public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - renderContext.render(wrc.getPortlet()); + rendererContext.render(wrc.getPortlet()); } } Deleted: trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,62 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.page; - -import org.jboss.portal.theme.render.DecorationRenderContext; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class DecorationRenderContextImpl implements DecorationRenderContext -{ - - final WindowContext wrc; - - public DecorationRenderContextImpl(WindowContext wrc) - { - this.wrc = wrc; - } - - public String getId() - { - return wrc.getId(); - } - - public String getTitle() - { - return wrc.result.getTitle(); - } - - public Collection getTriggerableActions(String familyName) - { - return wrc.result.getTriggerableActions(familyName); - } - - public String getProperty(String name) - { - return wrc.getProperty(name); - } -} Copied: trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRendererContextImpl.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRendererContextImpl.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRendererContextImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,62 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.page; + +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class DecorationRendererContextImpl implements DecorationRendererContext +{ + + final WindowContext wrc; + + public DecorationRendererContextImpl(WindowContext wrc) + { + this.wrc = wrc; + } + + public String getId() + { + return wrc.getId(); + } + + public String getTitle() + { + return wrc.result.getTitle(); + } + + public Collection getTriggerableActions(String familyName) + { + return wrc.result.getTriggerableActions(familyName); + } + + public String getProperty(String name) + { + return wrc.getProperty(name); + } +} Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,10 +23,11 @@ package org.jboss.portal.theme.page; import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.theme.PortalLayout; -import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.web.ServletContextDispatcher; @@ -47,14 +48,19 @@ private PageResult pageResult; /** . */ + private PortalTheme theme; + + /** . */ private PageService pageService; public PageRendition( PortalLayout layout, + PortalTheme theme, PageResult markupResult, PageService pageService) { this.layout = layout; + this.theme = theme; this.pageResult = markupResult; this.pageService = pageService; } @@ -62,29 +68,20 @@ /** Performs the page rendition. */ public void render(MarkupInfo markupInfo, ServletContextDispatcher dispatcher) throws IOException, ServletException { + ThemeContext themeContext = new ThemeContext(theme, pageService.getThemeService()); + // - RenderContext renderContext = layout.getRenderContext(markupInfo, dispatcher); + RendererContext rendererContext = layout.getRenderContext(themeContext, markupInfo, dispatcher); // try { - // Place a reference to the theme service into the request so that the theme tag can get to a theme via a theme - // name (specified as tag attribute); this is useful if no theme was defined for the portal or the page - renderContext.setAttribute(ThemeConstants.ATTR_THEME_SERVER, pageService.getThemeService()); - renderContext.setAttribute(ThemeConstants.ATTR_THEME, pageResult.getTheme()); - - // - renderContext.render(pageResult); + rendererContext.render(pageResult); } catch (RenderException e) { e.printStackTrace(); } - finally - { - renderContext.setAttribute(ThemeConstants.ATTR_THEME_SERVER, null); - renderContext.setAttribute(ThemeConstants.ATTR_THEME, null); - } } public PageResult getPageResult() Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.theme.page; -import org.jboss.portal.theme.render.PortalRenderSet; -import org.jboss.portal.theme.render.PageRenderContext; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.PortalTheme; +import org.jboss.portal.theme.PortalRenderSet; +import org.jboss.portal.theme.render.renderer.PageRendererContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import java.util.HashMap; import java.util.Map; @@ -41,7 +40,7 @@ * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> * @version $Revision$ */ -public class PageResult implements PageRenderContext +public class PageResult implements PageRendererContext { /** . */ @@ -66,9 +65,6 @@ protected PortalRenderSet renderSet; /** . */ - protected PortalTheme theme; - - /** . */ final Map regions; public PageResult(String pageName, Map pageProperties, Map portalProperties) @@ -87,16 +83,6 @@ this(pageName, new HashMap(), new HashMap()); } - public PortalTheme getTheme() - { - return theme; - } - - public void setTheme(PortalTheme theme) - { - this.theme = theme; - } - /** * Get a reference to the region object for the provided region name. * @@ -165,7 +151,7 @@ return windowContexts.keySet(); } - public WindowRenderContext getWindow(String windowId) + public WindowRendererContext getWindow(String windowId) { return getWindowContext(windowId); } @@ -230,9 +216,9 @@ return regions.values(); } - public RegionRenderContext getRegion(String regionName) + public RegionRendererContext getRegion(String regionName) { - return (RegionRenderContext)regions.get(regionName); + return (RegionRendererContext)regions.get(regionName); } public void rebuild() Deleted: trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,61 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.page; - -import org.jboss.portal.theme.render.PortletRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PortletRenderContextImpl implements PortletRenderContext -{ - - final WindowContext wrc; - - public PortletRenderContextImpl(WindowContext wrc) - { - this.wrc = wrc; - } - - public String getMarkup() - { - return wrc.result.getContent(); - } - - public String getProperty(String name) - { - return wrc.getProperty(name); - } - - public String getProperty(String name, int scope) - { - return getProperty(name); - } - - public WindowRenderContext getWindow() - { - return wrc; - } -} Copied: trunk/theme/src/main/org/jboss/portal/theme/page/PortletRendererContextImpl.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PortletRendererContextImpl.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PortletRendererContextImpl.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,61 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.page; + +import org.jboss.portal.theme.render.renderer.PortletRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortletRendererContextImpl implements PortletRendererContext +{ + + final WindowContext wrc; + + public PortletRendererContextImpl(WindowContext wrc) + { + this.wrc = wrc; + } + + public String getMarkup() + { + return wrc.result.getContent(); + } + + public String getProperty(String name) + { + return wrc.getProperty(name); + } + + public String getProperty(String name, int scope) + { + return getProperty(name); + } + + public WindowRendererContext getWindow() + { + return wrc; + } +} Modified: trunk/theme/src/main/org/jboss/portal/theme/page/Region.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.page; -import org.jboss.portal.theme.render.RegionRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; import org.jboss.portal.theme.Orientation; import java.util.ArrayList; @@ -39,7 +39,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public final class Region implements RegionRenderContext +public final class Region implements RegionRendererContext { /** . */ Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.theme.page; -import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.render.DecorationRenderContext; -import org.jboss.portal.theme.render.PortletRenderContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; @@ -39,7 +39,7 @@ * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> * @version $Revision$ */ -public final class WindowContext implements Comparable, Serializable, WindowRenderContext +public final class WindowContext implements Comparable, Serializable, WindowRendererContext { /** The serialVersionUID */ @@ -52,10 +52,10 @@ private final String name; /** . */ - private final DecorationRenderContextImpl decoration = new DecorationRenderContextImpl(this); + private final DecorationRendererContextImpl decoration = new DecorationRendererContextImpl(this); /** . */ - private final PortletRenderContextImpl portlet = new PortletRenderContextImpl(this); + private final PortletRendererContextImpl portlet = new PortletRendererContextImpl(this); // Mutable properties @@ -107,12 +107,12 @@ return result.getMode(); } - public DecorationRenderContext getDecoration() + public DecorationRendererContext getDecoration() { return decoration; } - public PortletRenderContext getPortlet() + public PortletRendererContext getPortlet() { return portlet; } Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -24,7 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.theme.render.ActionRenderContext; +import org.jboss.portal.theme.render.renderer.ActionRendererContext; import org.jboss.portal.portlet.Properties; import java.util.Collection; @@ -157,7 +157,7 @@ * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ - public static class Action implements ActionRenderContext + public static class Action implements ActionRendererContext { /** The origin of the action. */ private final String family; Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,44 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface ActionRenderContext extends ObjectRenderContext -{ - /** . */ - String MODES_KEY = "mode"; - /** . */ - String WINDOWSTATES_KEY = "windowstate"; - - String getName(); - - String getFamily(); - - String getURL(); - - boolean isEnabled(); - -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,39 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface DecorationRenderContext extends ObjectRenderContext -{ - - String getId(); - - String getTitle(); - - Collection getTriggerableActions(String familyName); -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,49 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * A decoration renderer is responsible for generating the markup of the portlet window title bar. <p>The decoration - * renderer has the responsibility to create the title , the window state links, and the portlet mode links. It is - * intended to be called by the <code>WindowRenderer</code> to produce part of the markup of a portlet wiindow. The - * other parts are intended to be created by the <code>PortletRenderer</code>, and the <code>WindowRenderer</code> - * itself.</p> - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet - * @see WindowRenderer - * @see PortletRenderer - */ -public interface DecorationRenderer extends ObjectRenderer -{ - /** - * Create the markup for the portlet decoration - * - * @param renderContext the state holder to provide information about the region, it's portlets, and the render set, - * which allows access to the other renderer interfaces of the render set. - * @throws RenderException - */ - void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException; - -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,32 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface ObjectRenderContext -{ - String getProperty(String name); -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * Generic renderer interface extended by all members of a render set. - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet - */ -public interface ObjectRenderer -{ -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,38 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface PageRenderContext extends ObjectRenderContext -{ - Collection getRegions(); - - RegionRenderContext getRegion(String regionName); - - WindowRenderContext getWindow(String windowId); -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,32 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface PageRenderer extends ObjectRenderer -{ - void render(RenderContext renderContext, PageRenderContext prc) throws RenderException; -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,186 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import org.jboss.portal.common.util.MediaType; -import org.jboss.portal.theme.RuntimeContext; -import org.jboss.portal.theme.ServerRegistrationID; -import org.jboss.portal.theme.impl.render.dynamic.DynaDecorationRenderer; -import org.jboss.portal.theme.impl.render.dynamic.DynaPortletRenderer; -import org.jboss.portal.theme.impl.render.dynamic.DynaRegionRenderer; -import org.jboss.portal.theme.impl.render.dynamic.DynaWindowRenderer; -import org.jboss.portal.theme.metadata.RendererSetMetaData; - -/** - * The portal render set is a set of renderer implementations for the markup container of a page. <p>A render set - * consists of 4 iterface implementations with some meta data describing the web application the render set is coming - * from, and the content type it is capable of handling.</p> - * - * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a>. - * @version <tt>$Revision$</tt> - */ -public final class PortalRenderSet -{ - - private final RegionRenderer regionRenderer; - private final WindowRenderer windowRenderer; - private final PortletRenderer portletRenderer; - private final DecorationRenderer decorationRenderer; - private final MediaType contentType; - private final String appID; - private final String name; - private final ServerRegistrationID registrationId; - private final boolean ajaxEnabled; - - /** - * construct a render set - * - * @param renderSetName the name of the render set as defined in the portal-renderSet.xml descriptor, or null if it - * was defined as part of a layout descriptor. - * @param runtimeContext the runtime environment (data describing the portal web application in wich the render set - * was defined) - * @param rendererSetMD meta data about an individual set of 4 renderer implementation together with their supported - * content type - * @throws IllegalAccessException - * @throws InstantiationException - * @throws ClassNotFoundException - */ - public PortalRenderSet(String renderSetName, RuntimeContext runtimeContext, RendererSetMetaData rendererSetMD) throws IllegalAccessException, InstantiationException, ClassNotFoundException - { - // there CAN be render sets without a name ! - - if (runtimeContext == null) - { - throw new IllegalArgumentException("no valid container"); - } - if (rendererSetMD == null) - { - throw new IllegalArgumentException("no valid set"); - } - this.name = renderSetName; - this.appID = runtimeContext.getAppId(); - this.registrationId = ServerRegistrationID.createID(ServerRegistrationID.TYPE_RENDERSET, new String[]{appID, name}); - this.contentType = rendererSetMD.getContentType(); - this.ajaxEnabled = rendererSetMD.isAjaxEnabled(); - - if (ajaxEnabled) // wrap the current renderer with the ajax delegator one. - { - this.regionRenderer = new DynaRegionRenderer((RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer())); - this.windowRenderer = new DynaWindowRenderer((WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer())); - this.portletRenderer = new DynaPortletRenderer((PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer())); - this.decorationRenderer = new DynaDecorationRenderer((DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer())); - } - else - { - this.regionRenderer = (RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer()); - this.windowRenderer = (WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer()); - this.portletRenderer = (PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer()); - this.decorationRenderer = (DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer()); - } - } - - public ServerRegistrationID getRegistrationId() - { - return registrationId; - } - - /** - * @see PortalRenderSet#getMediaType - */ - public MediaType getMediaType() - { - return contentType; - } - - /** - * Get the name of the application (the WAR) that contains this render set. - * - * @return the name of the application (the WAR) that contains this render set - */ - public String getAppId() - { - return appID; - } - - /** - * Get the name of this render set. - * - * @return the name of this render set - */ - public String getName() - { - return name; - } - - /** - * @see PortalRenderSet#getRegionRenderer - */ - public RegionRenderer getRegionRenderer() - { - return regionRenderer; - } - - /** - * @see PortalRenderSet#getWindowRenderer - */ - public WindowRenderer getWindowRenderer() - { - return windowRenderer; - } - - /** - * @see org.jboss.portal.theme.render.PortalRenderSet#getPortletRenderer - */ - public PortletRenderer getPortletRenderer() - { - return portletRenderer; - } - - /** - * @see PortalRenderSet#getDecorationRenderer - */ - public DecorationRenderer getDecorationRenderer() - { - return decorationRenderer; - } - - public boolean isAjaxEnabled() - { - return ajaxEnabled; - } - - /** - * @see java.lang.Object#toString - */ - public String toString() - { - return "PortalRenderSet: " + getAppId() + "." + (getName() == null ? "<from layout>" : getName()) + ": " + - getMediaType() + " [" + getRegionRenderer() + "][" + getWindowRenderer() + "][" + getDecorationRenderer() + - "][" + getPortletRenderer() + "]"; - } - - private ObjectRenderer loadRenderer(ClassLoader loader, String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException - { - return (ObjectRenderer)loader.loadClass(className).newInstance(); - } -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface PortletRenderContext extends ObjectRenderContext -{ - - String getMarkup(); - -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,51 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * The portlet renderer is responsible for adding the created markup of a portlet to the page. <p>The portlet renderer - * is intended to be called by the <code>WindowRenderer</code> as part of the generation of the markup for a portlet - * window. The portlet renderer is not responsible for generating the decoration markup, like the title. The - * <code>DecorationRenderer</code> is responsible for that. It is also called by the <code>WindowRenderer</code> as part - * of the render process for one portlet window.</p> - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet - * @see WindowRenderer - * @see DecorationRenderer - */ -public interface PortletRenderer - extends ObjectRenderer -{ - /** - * Render the markup of a portlet. <p>Note: this is not calling the portlet container to produce the markup. The - * markup has already been created. The PortletRenderer only places the markup on the page, and can gnerate some - * containing markup around it if it chooses to do so</p>. - * - * @param renderContext the state holder to provide information about the region, it's portlets, and the render set, - * which allows access to the other renderer interfaces of the render set. - * @throws RenderException - */ - void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException; -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,43 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import org.jboss.portal.theme.Orientation; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface RegionRenderContext extends ObjectRenderContext -{ - - String getId(); - - Collection getWindows(); - - Orientation getOrientation(); - - String getCSSId(); -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,45 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -/** - * A region renderer is responsible to create the markup container for a set of portlets on a page region. <p>The - * Portlets on a portal page can be assigned to regions of that page. Regions are sub elements of a page, that will be - * used by a layout to position groups of portlets over the areas of the page. The region renderer can be invoked to - * render the entire content of the region. It is assumed to take over the responsibility of delegating to the - * <code>WindowRenderer</code> for each portlet that needs to be rendered in the region in question.</p> - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet - * @see WindowRenderer - */ -public interface RegionRenderer - extends ObjectRenderer -{ - void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; - - void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; - - void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,209 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import org.jboss.portal.common.util.MediaType; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.web.ServletContextDispatcher; - -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.io.PrintWriter; - -/** - * A render context to render a context on a page. <p>A render context is scoped to a MarkupContainer (a region, or a - * window). A render context that is not scoped to a MarkupContainer is ment to be a page level template to allow easier - * creation of the region and window render contexts via the <code>RenderContext.getContext()</code> methods.</p> - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - */ -public abstract class RenderContext -{ - - /** . */ - private RendererFactory rendererFactory; - - /** . */ - private ServletContextDispatcher dispatcher; - - /** . */ - private MarkupInfo markupInfo; - - /** . */ - private ArrayList stack; - - /** . */ - private Map attributes; - - /** - * Create a new render context for the provided result. <p>The result contains information about the markup container - * (page, region , window context) to render.</p> - */ - public RenderContext( - RendererFactory rendererFactory, - ServletContextDispatcher dispatcher, - MarkupInfo markupInfo) - { - if (rendererFactory == null) - { - throw new IllegalArgumentException("no renderer factory provided"); - } - if (dispatcher == null) - { - throw new IllegalArgumentException("no server invocation provided"); - } - if (markupInfo == null) - { - throw new IllegalArgumentException("no stream info provided"); - } - - this.rendererFactory = rendererFactory; - this.dispatcher = dispatcher; - this.markupInfo = markupInfo; - this.stack = new ArrayList(6); - this.attributes = new HashMap(); - } - - public abstract PrintWriter getWriter(); - - public ServletContextDispatcher getDispatcher() - { - return dispatcher; - } - - public MarkupInfo getMarkupInfo() - { - return markupInfo; - } - - public MediaType getContentType() - { - return markupInfo.getContentType(); - } - - public String getCharset() - { - return markupInfo.getCharset(); - } - - public Object getAttribute(String attrName) - { - if (attrName == null) - { - throw new IllegalArgumentException("No null attribute name"); - } - return attributes.get(attrName); - } - - public void setAttribute(String attrName, Object attrValue) - { - if (attrName == null) - { - throw new IllegalArgumentException("No null attribute name"); - } - if (attrValue != null) - { - attributes.put(attrName, attrValue); - } - else - { - attributes.remove(attrName); - } - } - - public String getProperty(String propertyName) - { - for (int i = stack.size() - 1;i >= 0;i--) - { - ObjectRenderContext ctx = (ObjectRenderContext)stack.get(i); - String propertyValue = ctx.getProperty(propertyName); - if (propertyValue != null) - { - return propertyValue; - } - } - return null; - } - - public void pushObjectRenderContext(ObjectRenderContext ctx) - { - stack.add(ctx); - } - - public ObjectRenderContext popObjectRenderContext() - { - return (ObjectRenderContext)stack.remove(stack.size() - 1); - } - - public void render(ObjectRenderContext ctx) throws RenderException, IllegalStateException - { - pushObjectRenderContext(ctx); - - // - try - { - if (ctx instanceof PageRenderContext) - { - PageRenderContext prc = (PageRenderContext)ctx; - PageRenderer renderer = (PageRenderer)rendererFactory.getRenderer(this, prc); - renderer.render(this, prc); - } - if (ctx instanceof WindowRenderContext) - { - WindowRenderContext wrc = (WindowRenderContext)ctx; - WindowRenderer renderer = (WindowRenderer)rendererFactory.getRenderer(this, wrc); - renderer.render(this, wrc); - } - else if (ctx instanceof RegionRenderContext) - { - RegionRenderContext rrc = (RegionRenderContext)ctx; - RegionRenderer renderer = (RegionRenderer)rendererFactory.getRenderer(this, rrc); - - // - renderer.renderHeader(this, rrc); - renderer.renderBody(this, rrc); - renderer.renderFooter(this, rrc); - } - else if (ctx instanceof PortletRenderContext) - { - PortletRenderContext prc = (PortletRenderContext)ctx; - PortletRenderer renderer = (PortletRenderer)rendererFactory.getRenderer(this, prc); - renderer.render(this, prc); - } - else if (ctx instanceof DecorationRenderContext) - { - DecorationRenderContext drc = (DecorationRenderContext)ctx; - DecorationRenderer renderer = (DecorationRenderer)rendererFactory.getRenderer(this, drc); - - // - renderer.render(this, drc); - } - } - finally - { - popObjectRenderContext(); - } - } -} \ No newline at end of file Added: trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,233 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render; + +import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.web.ServletContextDispatcher; +import org.jboss.portal.theme.render.renderer.DecorationRendererContext; +import org.jboss.portal.theme.render.renderer.DecorationRenderer; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; +import org.jboss.portal.theme.render.renderer.ObjectRendererContext; +import org.jboss.portal.theme.render.renderer.RegionRenderer; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.PortletRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRenderer; +import org.jboss.portal.theme.render.renderer.PortletRenderer; +import org.jboss.portal.theme.render.renderer.PageRenderer; +import org.jboss.portal.theme.render.renderer.PageRendererContext; + +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.io.PrintWriter; + +/** + * A render context to render a context on a page. <p>A render context is scoped to a MarkupContainer (a region, or a + * window). A render context that is not scoped to a MarkupContainer is ment to be a page level template to allow easier + * creation of the region and window render contexts via the <code>RenderContext.getContext()</code> methods.</p> + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision: 6934 $, $LastChangedDate: 2007-04-06 16:30:52 +0200 (Fri, 06 Apr 2007) $ + */ +public abstract class RendererContext +{ + + private final ThemeContext themeContext; + + /** . */ + private final RendererFactory rendererFactory; + + /** . */ + private final ServletContextDispatcher dispatcher; + + /** . */ + private final MarkupInfo markupInfo; + + /** . */ + private final ArrayList stack; + + /** . */ + private final Map attributes; + + /** + * Create a new render context for the provided result. <p>The result contains information about the markup container + * (page, region , window context) to render.</p> + */ + public RendererContext( + ThemeContext themeContext, + RendererFactory rendererFactory, + ServletContextDispatcher dispatcher, + MarkupInfo markupInfo) + { + if (themeContext == null) + { + throw new IllegalArgumentException("no theme factory provided"); + } + if (rendererFactory == null) + { + throw new IllegalArgumentException("no renderer factory provided"); + } + if (dispatcher == null) + { + throw new IllegalArgumentException("no server invocation provided"); + } + if (markupInfo == null) + { + throw new IllegalArgumentException("no stream info provided"); + } + + this.themeContext = themeContext; + this.rendererFactory = rendererFactory; + this.dispatcher = dispatcher; + this.markupInfo = markupInfo; + this.stack = new ArrayList(6); + this.attributes = new HashMap(); + } + + public abstract PrintWriter getWriter(); + + public ThemeContext getThemeContext() + { + return themeContext; + } + + public ServletContextDispatcher getDispatcher() + { + return dispatcher; + } + + public MarkupInfo getMarkupInfo() + { + return markupInfo; + } + + public MediaType getContentType() + { + return markupInfo.getContentType(); + } + + public String getCharset() + { + return markupInfo.getCharset(); + } + + public Object getAttribute(String attrName) + { + if (attrName == null) + { + throw new IllegalArgumentException("No null attribute name"); + } + return attributes.get(attrName); + } + + public void setAttribute(String attrName, Object attrValue) + { + if (attrName == null) + { + throw new IllegalArgumentException("No null attribute name"); + } + if (attrValue != null) + { + attributes.put(attrName, attrValue); + } + else + { + attributes.remove(attrName); + } + } + + public String getProperty(String propertyName) + { + for (int i = stack.size() - 1;i >= 0;i--) + { + ObjectRendererContext ctx = (ObjectRendererContext)stack.get(i); + String propertyValue = ctx.getProperty(propertyName); + if (propertyValue != null) + { + return propertyValue; + } + } + return null; + } + + public void pushObjectRenderContext(ObjectRendererContext ctx) + { + stack.add(ctx); + } + + public ObjectRendererContext popObjectRenderContext() + { + return (ObjectRendererContext)stack.remove(stack.size() - 1); + } + + public void render(ObjectRendererContext ctx) throws RenderException, IllegalStateException + { + pushObjectRenderContext(ctx); + + // + try + { + if (ctx instanceof PageRendererContext) + { + PageRendererContext prc = (PageRendererContext)ctx; + PageRenderer renderer = (PageRenderer)rendererFactory.getRenderer(this, prc); + renderer.render(this, prc); + } + if (ctx instanceof WindowRendererContext) + { + WindowRendererContext wrc = (WindowRendererContext)ctx; + WindowRenderer renderer = (WindowRenderer)rendererFactory.getRenderer(this, wrc); + renderer.render(this, wrc); + } + else if (ctx instanceof RegionRendererContext) + { + RegionRendererContext rrc = (RegionRendererContext)ctx; + RegionRenderer renderer = (RegionRenderer)rendererFactory.getRenderer(this, rrc); + + // + renderer.renderHeader(this, rrc); + renderer.renderBody(this, rrc); + renderer.renderFooter(this, rrc); + } + else if (ctx instanceof PortletRendererContext) + { + PortletRendererContext prc = (PortletRendererContext)ctx; + PortletRenderer renderer = (PortletRenderer)rendererFactory.getRenderer(this, prc); + renderer.render(this, prc); + } + else if (ctx instanceof DecorationRendererContext) + { + DecorationRendererContext drc = (DecorationRendererContext)ctx; + DecorationRenderer renderer = (DecorationRenderer)rendererFactory.getRenderer(this, drc); + + // + renderer.render(this, drc); + } + } + finally + { + popObjectRenderContext(); + } + } +} \ No newline at end of file Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RendererFactory.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,13 +22,25 @@ ******************************************************************************/ package org.jboss.portal.theme.render; +import org.jboss.portal.theme.render.renderer.ObjectRenderer; +import org.jboss.portal.theme.render.renderer.ObjectRendererContext; + /** + * A factory for providing the appropriate renderers. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ public interface RendererFactory { - ObjectRenderer getRenderer(RenderContext renderContext, ObjectRenderContext objectRenderContext); + /** + * Return the appropriate renderer. + * + * @param rendererContext the render context + * @param objectRendererContext the object render context + * @return the appropriate renderer + */ + ObjectRenderer getRenderer(RendererContext rendererContext, ObjectRendererContext objectRendererContext); } Added: trunk/theme/src/main/org/jboss/portal/theme/render/ThemeContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ThemeContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ThemeContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,69 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render; + +import org.jboss.portal.theme.PortalTheme; +import org.jboss.portal.theme.ThemeServiceInfo; + +/** + * Provide a context for theme related services. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ThemeContext +{ + + /** . */ + private PortalTheme theme; + + /** . */ + private ThemeServiceInfo themeServiceInfo; + + public ThemeContext(PortalTheme theme, ThemeServiceInfo themeServiceInfo) + { + this.theme = theme; + this.themeServiceInfo = themeServiceInfo; + } + + /** + * Returns the render context theme, it may be null if no theme was set. + * + * @return the theme + */ + public PortalTheme getTheme() + { + return theme; + } + + /** + * Returns a theme matching the provided theme name or null if not found. + * + * @param themeName the theme name + * @return the theme + */ + public PortalTheme getTheme(String themeName) + { + return themeServiceInfo.getTheme(themeName, false); + } +} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderContext.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,47 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface WindowRenderContext extends ObjectRenderContext -{ - - String getId(); - - int getOrder(); - - WindowState getWindowState(); - - Mode getMode(); - - DecorationRenderContext getDecoration(); - - PortletRenderContext getPortlet(); - -} Deleted: trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -1,60 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.theme.render; - -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.theme.page.WindowResult; - -/** - * A window renderer is responsible for the creation of the markup of each portlet window in a portal page region. <p>A - * Portlet window is the frame (the container) around the markup gernerated by the Portlet. It includes things like the - * title, and the portlet mode and portlet window state information. The window renderer is assumed to delegate to the - * <code>DecorationRenderer</code> to generate the title and mode and state markup, and to the - * <code>PortletRenderer</code> to render the markup produced by the portlet. Note that the renderer do not call the - * portlet container to execute the doView doEdit etc. method. The renderer is only responsible for placing the created - * markup inside the page, and creating the necessary markup around it.</p> - * - * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> - * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet - * @see RegionRenderer - * @see DecorationRenderer - * @see PortletRenderer - */ -public interface WindowRenderer - extends ObjectRenderer -{ - /** - * Render the markup of a portlet window. - * - * @param renderContext the state holder to provide information about the region, it's portlets, and the render set, - * which allows access to the other renderer interfaces of the render set. - * @throws RenderException - * @see RegionRenderer#renderBody - * @see PortletRenderer#render - * @see DecorationRenderer#render - * @see WindowContext - * @see WindowResult - */ - void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException; -} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ActionRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,44 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface ActionRendererContext extends ObjectRendererContext +{ + /** . */ + String MODES_KEY = "mode"; + /** . */ + String WINDOWSTATES_KEY = "windowstate"; + + String getName(); + + String getFamily(); + + String getURL(); + + boolean isEnabled(); + +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,52 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RenderException; + +/** + * A decoration renderer is responsible for generating the markup of the portlet window title bar. <p>The decoration + * renderer has the responsibility to create the title , the window state links, and the portlet mode links. It is + * intended to be called by the <code>WindowRenderer</code> to produce part of the markup of a portlet wiindow. The + * other parts are intended to be created by the <code>PortletRenderer</code>, and the <code>WindowRenderer</code> + * itself.</p> + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + * @see WindowRenderer + * @see PortletRenderer + */ +public interface DecorationRenderer extends ObjectRenderer +{ + /** + * Create the markup for the portlet decoration + * + * @param rendererContext the state holder to provide information about the region, it's portlets, and the render set, + * which allows access to the other renderer interfaces of the render set. + * @throws org.jboss.portal.theme.render.RenderException + */ + void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException; + +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/DecorationRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface DecorationRendererContext extends ObjectRendererContext +{ + + String getId(); + + String getTitle(); + + Collection getTriggerableActions(String familyName); +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +/** + * Generic renderer interface extended by all members of a render set. + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + */ +public interface ObjectRenderer +{ +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/ObjectRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,32 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface ObjectRendererContext +{ + String getProperty(String name); +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,35 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RenderException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PageRenderer extends ObjectRenderer +{ + void render(RendererContext rendererContext, PageRendererContext prc) throws RenderException; +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PageRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,38 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PageRendererContext extends ObjectRendererContext +{ + Collection getRegions(); + + RegionRendererContext getRegion(String regionName); + + WindowRendererContext getWindow(String windowId); +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,54 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RenderException; + +/** + * The portlet renderer is responsible for adding the created markup of a portlet to the page. <p>The portlet renderer + * is intended to be called by the <code>WindowRenderer</code> as part of the generation of the markup for a portlet + * window. The portlet renderer is not responsible for generating the decoration markup, like the title. The + * <code>DecorationRenderer</code> is responsible for that. It is also called by the <code>WindowRenderer</code> as part + * of the render process for one portlet window.</p> + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + * @see WindowRenderer + * @see DecorationRenderer + */ +public interface PortletRenderer + extends ObjectRenderer +{ + /** + * Render the markup of a portlet. <p>Note: this is not calling the portlet container to produce the markup. The + * markup has already been created. The PortletRenderer only places the markup on the page, and can gnerate some + * containing markup around it if it chooses to do so</p>. + * + * @param rendererContext the state holder to provide information about the region, it's portlets, and the render set, + * which allows access to the other renderer interfaces of the render set. + * @throws org.jboss.portal.theme.render.RenderException + */ + void render(RendererContext rendererContext, PortletRendererContext prc) throws RenderException; +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/PortletRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PortletRendererContext extends ObjectRendererContext +{ + + String getMarkup(); + +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,48 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RenderException; + +/** + * A region renderer is responsible to create the markup container for a set of portlets on a page region. <p>The + * Portlets on a portal page can be assigned to regions of that page. Regions are sub elements of a page, that will be + * used by a layout to position groups of portlets over the areas of the page. The region renderer can be invoked to + * render the entire content of the region. It is assumed to take over the responsibility of delegating to the + * <code>WindowRenderer</code> for each portlet that needs to be rendered in the region in question.</p> + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + * @see WindowRenderer + */ +public interface RegionRenderer + extends ObjectRenderer +{ + void renderBody(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException; + + void renderHeader(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException; + + void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException; +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/RegionRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,43 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.Orientation; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface RegionRendererContext extends ObjectRendererContext +{ + + String getId(); + + Collection getWindows(); + + Orientation getOrientation(); + + String getCSSId(); +} Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,62 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.RenderException; + +/** + * A window renderer is responsible for the creation of the markup of each portlet window in a portal page region. <p>A + * Portlet window is the frame (the container) around the markup gernerated by the Portlet. It includes things like the + * title, and the portlet mode and portlet window state information. The window renderer is assumed to delegate to the + * <code>DecorationRenderer</code> to generate the title and mode and state markup, and to the + * <code>PortletRenderer</code> to render the markup produced by the portlet. Note that the renderer do not call the + * portlet container to execute the doView doEdit etc. method. The renderer is only responsible for placing the created + * markup inside the page, and creating the necessary markup around it.</p> + * + * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> + * @version $LastChangedRevision$, $LastChangedDate$ + * @see org.jboss.portal.theme.PortalRenderSet + * @see RegionRenderer + * @see DecorationRenderer + * @see PortletRenderer + */ +public interface WindowRenderer + extends ObjectRenderer +{ + /** + * Render the markup of a portlet window. + * + * @param rendererContext the state holder to provide information about the region, it's portlets, and the render set, + * which allows access to the other renderer interfaces of the render set. + * @throws org.jboss.portal.theme.render.RenderException + * @see RegionRenderer#renderBody + * @see PortletRenderer#render + * @see DecorationRenderer#render + * @see WindowContext + * @see WindowResult + */ + void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException; +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRenderer.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java (from rev 6941, trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderContext.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/renderer/WindowRendererContext.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.render.renderer; + +import org.jboss.portal.WindowState; +import org.jboss.portal.Mode; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface WindowRendererContext extends ObjectRendererContext +{ + + String getId(); + + int getOrder(); + + WindowState getWindowState(); + + Mode getMode(); + + DecorationRendererContext getDecoration(); + + PortletRendererContext getPortlet(); + +} Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -24,7 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.portal.theme.LayoutConstants; -import org.jboss.portal.theme.render.PageRenderContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; import org.jboss.portal.common.NotYetImplemented; import javax.servlet.http.HttpServletRequest; @@ -43,7 +43,7 @@ * * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a>. * @version <tt>$Revision$</tt> - * @see org.jboss.portal.theme.render.PortalRenderSet + * @see org.jboss.portal.theme.PortalRenderSet */ public class PortletTagHandler extends SimpleTagSupport { @@ -58,10 +58,10 @@ * * @throws javax.servlet.jsp.JspException * @throws java.io.IOException - * @see org.jboss.portal.theme.render.PortalRenderSet#getWindowRenderer - * @see org.jboss.portal.theme.render.WindowRenderer#render - * @see org.jboss.portal.theme.render.PortletRenderer#render - * @see org.jboss.portal.theme.render.DecorationRenderer#render + * @see org.jboss.portal.theme.PortalRenderSet#getWindowRenderer + * @see org.jboss.portal.theme.render.renderer.WindowRenderer#render + * @see org.jboss.portal.theme.render.renderer.PortletRenderer#render + * @see org.jboss.portal.theme.render.renderer.DecorationRenderer#render */ public void doTag() throws JspException, IOException { @@ -82,7 +82,7 @@ PageContext app = (PageContext)getJspContext(); HttpServletRequest request = (HttpServletRequest)app.getRequest(); - PageRenderContext page = (PageRenderContext)request.getAttribute(LayoutConstants.ATTR_PAGE); + PageRendererContext page = (PageRendererContext)request.getAttribute(LayoutConstants.ATTR_PAGE); if (page == null) { out.write("<p bgcolor='red'>No page to render!</p>"); Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -25,10 +25,10 @@ import org.jboss.logging.Logger; import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.Orientation; -import org.jboss.portal.theme.impl.JSPRenderContext; +import org.jboss.portal.theme.impl.JSPRendererContext; import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.PageRenderContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -48,7 +48,7 @@ * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @author <a href="mailto:roy@jboss.org>Roy Russo</a> * @version $LastChangedRevision$, $LastChangedDate$ - * @see org.jboss.portal.theme.render.PortalRenderSet + * @see org.jboss.portal.theme.PortalRenderSet */ public class RegionTagHandler extends SimpleTagSupport @@ -78,7 +78,7 @@ PageContext app = (PageContext)getJspContext(); HttpServletRequest request = (HttpServletRequest)app.getRequest(); - PageRenderContext page = (PageRenderContext)request.getAttribute(LayoutConstants.ATTR_PAGE); + PageRendererContext page = (PageRendererContext)request.getAttribute(LayoutConstants.ATTR_PAGE); JspWriter out = this.getJspContext().getOut(); if (page == null) { @@ -95,7 +95,7 @@ if (page.getRegion(regionName) == null) // non-window display of content { // Create a dummy region obj, based on region name - RegionRenderContext rrc = new RegionRenderContext() + RegionRendererContext rrc = new RegionRendererContext() { public String getId() { @@ -105,7 +105,7 @@ { return Collections.EMPTY_LIST; } - public PageRenderContext getPage() + public PageRendererContext getPage() { return null; } @@ -123,7 +123,7 @@ } }; - JSPRenderContext renderContext = (JSPRenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); + JSPRendererContext renderContext = (JSPRendererContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); try { PrintWriter pw = new PrintWriter(out); @@ -139,15 +139,15 @@ else { // window-centric display of content - JSPRenderContext renderContext = (JSPRenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); + JSPRendererContext renderContext = (JSPRendererContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); if (renderContext == null) { log.debug("no render context available in request"); return; } - final RegionRenderContext region = page.getRegion(regionName); - RegionRenderContext rrc = new RegionRenderContext() + final RegionRendererContext region = page.getRegion(regionName); + RegionRendererContext rrc = new RegionRendererContext() { public String getId() { Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -24,12 +24,11 @@ import org.jboss.logging.Logger; import org.jboss.portal.theme.PortalTheme; -import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.theme.ThemeServiceInfo; import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.ThemeElement; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; -import org.jboss.portal.theme.render.RenderContext; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.ThemeContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -70,8 +69,6 @@ * * @throws JspException * @throws IOException - * @see org.jboss.portal.theme.ThemeConstants#ATTR_THEME - * @see org.jboss.portal.theme.ThemeConstants#ATTR_THEME_SERVER * @see org.jboss.portal.theme.PortalTheme */ public void doTag() throws JspException, IOException @@ -83,18 +80,19 @@ HttpServletRequest request = (HttpServletRequest)app.getRequest(); // Get the theme provided as a render context attribute - RenderContext renderContext = (RenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); - PortalTheme theme = (PortalTheme)renderContext.getAttribute(ThemeConstants.ATTR_THEME); - ThemeServiceInfo themeServer = (ThemeServiceInfo)renderContext.getAttribute(ThemeConstants.ATTR_THEME_SERVER); + RendererContext rendererContext = (RendererContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT); + ThemeContext themeContext = rendererContext.getThemeContext(); + PortalTheme theme = themeContext.getTheme(); + // - String jsBase = renderContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); + String jsBase = rendererContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); out.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n"); // If no theme provided we use what may be on the tag - if (theme == null && themeServer != null && themeName != null && themeName.length() > 0) + if (theme == null && themeName != null && themeName.length() > 0) { - theme = themeServer.getTheme(getThemeName(), false); + theme = themeContext.getTheme(getThemeName()); } // Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.tag.basic; -import org.jboss.portal.theme.render.ActionRenderContext; +import org.jboss.portal.theme.render.renderer.ActionRendererContext; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -63,7 +63,7 @@ { if (iterator.hasNext()) { - ActionRenderContext action = (ActionRenderContext)iterator.next(); + ActionRendererContext action = (ActionRendererContext)iterator.next(); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_NAME, action.getName()); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_URL, action.getURL()); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_ENABLED, Boolean.valueOf(action.isEnabled())); Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,9 +23,9 @@ package org.jboss.portal.theme.tag.basic; import org.jboss.portal.theme.LayoutConstants; -import org.jboss.portal.theme.render.PageRenderContext; -import org.jboss.portal.theme.render.RegionRenderContext; -import org.jboss.portal.theme.render.WindowRenderContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; +import org.jboss.portal.theme.render.renderer.WindowRendererContext; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -53,10 +53,10 @@ private Iterator iterator; /** . */ - private PageRenderContext pageRenderContext; + private PageRendererContext pageRenderContext; /** . */ - private WindowRenderContext windowRenderContext; + private WindowRendererContext windowRenderContext; public String getRegion() { @@ -68,7 +68,7 @@ this.region = region; } - public WindowRenderContext getWindowRenderContext() + public WindowRendererContext getWindowRenderContext() { return windowRenderContext; } @@ -80,7 +80,7 @@ if (iterator.hasNext()) { // Get the next window context - windowRenderContext = (WindowRenderContext)iterator.next(); + windowRenderContext = (WindowRendererContext)iterator.next(); // Set the implicit content pageContext.setAttribute(ForEachWindowInRegionTEI.IMPLICIT_CONTENT, this.windowRenderContext.getPortlet().getMarkup()); @@ -100,19 +100,19 @@ public int doStartTag() throws JspException { // Get the aggrehated page result from the request - pageRenderContext = (PageRenderContext)pageContext.getRequest().getAttribute(LayoutConstants.ATTR_PAGE); + pageRenderContext = (PageRendererContext)pageContext.getRequest().getAttribute(LayoutConstants.ATTR_PAGE); // Aggregate the regions parameterized in the region attribute List windows = new ArrayList(10); for (StringTokenizer tokenizer = new StringTokenizer(this.region, ","); tokenizer.hasMoreTokens();) { String token = tokenizer.nextToken().trim(); - RegionRenderContext region = pageRenderContext.getRegion(token); + RegionRendererContext region = pageRenderContext.getRegion(token); if (region != null) { for (Iterator i = region.getWindows().iterator(); i.hasNext();) { - WindowRenderContext window = (WindowRenderContext)i.next(); + WindowRendererContext window = (WindowRendererContext)i.next(); windows.add(window); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java 2007-04-07 10:13:16 UTC (rev 6942) @@ -23,8 +23,8 @@ package org.jboss.portal.theme.tag.basic; import org.jboss.portal.theme.LayoutConstants; -import org.jboss.portal.theme.render.PageRenderContext; -import org.jboss.portal.theme.render.RegionRenderContext; +import org.jboss.portal.theme.render.renderer.PageRendererContext; +import org.jboss.portal.theme.render.renderer.RegionRendererContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -55,8 +55,8 @@ public int doStartTag() throws JspException { HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); - PageRenderContext page = (PageRenderContext)request.getAttribute(LayoutConstants.ATTR_PAGE); - RegionRenderContext region = page.getRegion(this.region); + PageRendererContext page = (PageRendererContext)request.getAttribute(LayoutConstants.ATTR_PAGE); + RegionRendererContext region = page.getRegion(this.region); if (region != null) { return Tag.EVAL_BODY_INCLUDE;

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6941 - in trunk: core-samples/src/main/org/jboss/portal/core/portlet/test and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 20:31:37 -0400 (Fri, 06 Apr 2007) New Revision: 6941 Added: trunk/core-samples/src/main/org/jboss/portal/core/portlet/test/FileUploadPortlet.java Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: - added a file upload portlet in the examples - add the enctype when it is present on the XHR - if enctype is multipart/formdata don't handle it as an ajax request Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-06 22:47:51 UTC (rev 6940) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-07 00:31:37 UTC (rev 6941) @@ -164,7 +164,7 @@ } else { - throw new Error("todo"); + throw new Error("todo " + commandResponse); } } else if (commandResponse instanceof UpdateWindowMarkupResponse) Added: trunk/core-samples/src/main/org/jboss/portal/core/portlet/test/FileUploadPortlet.java =================================================================== --- trunk/core-samples/src/main/org/jboss/portal/core/portlet/test/FileUploadPortlet.java (rev 0) +++ trunk/core-samples/src/main/org/jboss/portal/core/portlet/test/FileUploadPortlet.java 2007-04-07 00:31:37 UTC (rev 6941) @@ -0,0 +1,108 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.portlet.test; + +import org.apache.commons.fileupload.portlet.PortletFileUpload; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; + +import javax.portlet.GenericPortlet; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.PortletException; +import javax.portlet.PortletSecurityException; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class FileUploadPortlet extends GenericPortlet +{ + + + public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException + { + + // + List fileNames = new ArrayList(); + List fileSizes = new ArrayList(); + + // + try + { + DiskFileItemFactory factory = new DiskFileItemFactory(); + PortletFileUpload upload = new PortletFileUpload(factory); + List fileItems = upload.parseRequest(req); + for (Iterator iterator = fileItems.iterator();iterator.hasNext();) + { + FileItem item = (FileItem)iterator.next(); + if (!item.isFormField()) + { + fileNames.add("" + item.getName()); + fileSizes.add("" + item.getSize()); + } + } + } + catch (FileUploadException e) + { + throw new PortletException(e); + } + + // + resp.setRenderParameter("fileNames", (String[])fileNames.toArray(new String[fileNames.size()])); + resp.setRenderParameter("fileSizes", (String[])fileSizes.toArray(new String[fileSizes.size()])); + } + + protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { + // + resp.setContentType("text/html"); + + // + PrintWriter writer = resp.getWriter(); + + String[] fileNames = req.getParameterValues("fileNames"); + String[] fileSizes = req.getParameterValues("fileSizes"); + if (fileNames != null && fileSizes != null && fileNames.length == fileSizes.length) + { + for (int i = 0;i < fileNames.length;i++) + { + writer.println("Received file " + fileNames[i] + " with size " + fileSizes[i] + "<br/>"); + } + } + + // + writer.println("<form action=\"" + resp.createActionURL() + "\" method=\"post\" enctype=\"multipart/form-data\">"); + writer.println("<input type=\"file\" name=\"File\">"); + writer.println("<input type=\"submit\" name=\"Upload\">"); + writer.println("</form>"); + } +} Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-04-06 22:47:51 UTC (rev 6940) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-04-07 00:31:37 UTC (rev 6941) @@ -146,4 +146,10 @@ <portlet-ref>FSContentDrivenPortlet</portlet-ref> </instance> </deployment> + <deployment> + <instance> + <instance-id>FileUploadPortletInstance</instance-id> + <portlet-ref>FileUploadPortlet</portlet-ref> + </instance> + </deployment> </deployments> \ No newline at end of file Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-04-06 22:47:51 UTC (rev 6940) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-04-07 00:31:37 UTC (rev 6941) @@ -347,6 +347,19 @@ <keywords>sample,test</keywords> </portlet-info> </portlet> + <portlet> + <description>File Upload Portlet</description> + <portlet-name>FileUploadPortlet</portlet-name> + <display-name>File Upload Portlet</display-name> + <portlet-class>org.jboss.portal.core.portlet.test.FileUploadPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <portlet-info> + <title>File Upload Portlet</title> + <keywords>sample,test</keywords> + </portlet-info> + </portlet> <user-attribute> <name>user.name.nickName</name> </user-attribute> Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-06 22:47:51 UTC (rev 6940) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 00:31:37 UTC (rev 6941) @@ -47,19 +47,20 @@ // We found the window if (container != null) { - - var form = source.nodeName == "FORM"; - var link = !form & source.nodeName == "A"; - + // + var options = new Object(); var url; - var body; - var method; + // if (source.nodeName == "A") { url = source.href; - method = "get"; - body = ""; + + // We have a get + options.method = "get" + + // We don't block + options.asynchronous = true; } else if (source.nodeName == "INPUT" && source.type == "submit") { @@ -72,26 +73,38 @@ // Check we have a form and use it if (current.nodeName == 'FORM') { - // - url = current.action; + var enctype = current.enctype - // Get body if needed - if (current.method.toLowerCase() == "post") { - body = Form.serialize(current); - method = "post"; + // We don't handle file upload for now + if (enctype != "multipart/form-data") { + // Set URL + url = current.action; + + // Set the specified enctype + options.enctype = enctype; + + // Action blocks + options.asynchronous = false; + + // Add body if needed + if (current.method.toLowerCase() == "post") { + options.method = "post" + options.postBody = Form.serialize(current); + } + else { + options.method = "get" + } } - else - { - body = ""; - method = "get"; - } } } // Handle links here if (url != null) { - // + + // Setup headers var headers = ["ajax","true"]; + + // Add the view state value if (view_state !== undefined) { headers.view_state = view_state; @@ -101,54 +114,39 @@ // of a post, the parameters will be appended to the body of the query which // will lead to a non correct request - // If we process a form then we will perform a blocking interaction - var asynchronous = !form; - - // - var options = { - asynchronous:asynchronous, - method: method, - postBody: body, - requestHeaders:headers, - onSuccess: function(t) + // Complete the ajax request options + options.requestHeaders = headers; + options.onSuccess = function(t) + { + var resp = ""; + eval("resp =" + t.responseText + ";"); + if (resp.type == "update_markup") { - var resp = ""; - eval("resp =" + t.responseText + ";"); - if (resp.type == "update_markup") + // Iterate all changes + for (var id in resp.fragments) { - // Iterate all changes - for (var id in resp.fragments) + var matchingElt = document.getElementById(id); + + // Different than 1 is not good + if (matchingElt != null) { - var matchingElt = document.getElementById(id); + var markup = resp.fragments[id]; + markup = markup.substring(25, markup.length - 7); - // Different than 1 is not good - if (matchingElt != null) - { - var markup = resp.fragments[id]; - markup = markup.substring(25, markup.length - 7); - - var markupContainer = Element.up(matchingElt); - markupContainer.innerHTML = markup; - } + var markupContainer = Element.up(matchingElt); + markupContainer.innerHTML = markup; } - - // update view state - view_state = resp.view_state; } - else if (resp.type == "update_page") - { - document.location = resp.location; - } + + // update view state + view_state = resp.view_state; } + else if (resp.type == "update_page") + { + document.location = resp.location; + } }; - // Add the form post body - // todo : detect file upload - if (form) - { - options.postBody = Form.serialize(source); - } - // Event.stop(event); new Ajax.Request(url, options);

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6940 - trunk/core/src/main/org/jboss/portal/core/impl/model/content.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 18:47:51 -0400 (Fri, 06 Apr 2007) New Revision: 6940 Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java Log: when a portlet is not found in InternalContentProvide, do not log the NoSuchPortletException Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-06 22:43:02 UTC (rev 6939) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-06 22:47:51 UTC (rev 6940) @@ -210,16 +210,15 @@ } catch (PortletInvokerException e) { - log.error("Portlet invoker exception during portlet window rendering", e); - - // if (e instanceof NoSuchPortletException) { - throw new ResourceNotFoundException(((NoSuchPortletException)e).getPortletId()); } else { + log.error("Portlet invoker exception during portlet window rendering", e); + + // throw new ControllerException(e); } }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6939 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 18:43:02 -0400 (Fri, 06 Apr 2007) New Revision: 6939 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: remove unused stuff Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-06 22:39:33 UTC (rev 6938) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-06 22:43:02 UTC (rev 6939) @@ -161,7 +161,6 @@ delegate.renderHeader(renderContext, rrc); // We need height and width otherwise the region will not be usable when empty -// markup.print("<div class=\"dyna-region\" style=\"min-height:10px\" id=\""); markup.print("<div class=\"dyna-region\" id=\""); markup.print(rrc.getId()); markup.print("\">");

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6938 - trunk/theme/src/bin/portal-ajax-war.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 18:39:33 -0400 (Fri, 06 Apr 2007) New Revision: 6938 Removed: trunk/theme/src/bin/portal-ajax-war/images/ trunk/theme/src/bin/portal-ajax-war/js/ Log: remove unused stuff

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6937 - trunk/theme/src/resources/test/theme-test-war/WEB-INF.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 18:34:10 -0400 (Fri, 06 Apr 2007) New Revision: 6937 Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml Log: improves how a region is minimal for receiving draggable elements using min-height (with an IE6 hack :-( ) instead of height. Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-06 22:34:10 UTC (rev 6937) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<layouts> + <layout> + <name>generic</name> + <uri>/layouts/generic/index.jsp</uri> + <uri state="maximized">/layouts/generic/maximized.jsp</uri> + <regions> + <region name="left"/> + <region name="center"/> + <region name="navigation"/> + </regions> + </layout> +</layouts>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6936 - in trunk: theme and 9 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-06 18:33:41 -0400 (Fri, 06 Apr 2007) New Revision: 6936 Added: trunk/theme/src/bin/portal-ajax-war/dyna/ trunk/theme/src/bin/portal-ajax-war/dyna/builder.js trunk/theme/src/bin/portal-ajax-war/dyna/controls.js trunk/theme/src/bin/portal-ajax-war/dyna/dragdrop.js trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/bin/portal-ajax-war/dyna/effects.js trunk/theme/src/bin/portal-ajax-war/dyna/prototype.js trunk/theme/src/bin/portal-ajax-war/dyna/scriptaculous.js trunk/theme/src/bin/portal-ajax-war/dyna/slider.js trunk/theme/src/bin/portal-ajax-war/dyna/style.css trunk/theme/src/bin/portal-ajax-war/dyna/unittest.js Removed: trunk/theme/src/bin/portal-ajax-war/js/portal/builder.js trunk/theme/src/bin/portal-ajax-war/js/portal/controls.js trunk/theme/src/bin/portal-ajax-war/js/portal/dragdrop.js trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js trunk/theme/src/bin/portal-ajax-war/js/portal/effects.js trunk/theme/src/bin/portal-ajax-war/js/portal/prototype.js trunk/theme/src/bin/portal-ajax-war/js/portal/scriptaculous.js trunk/theme/src/bin/portal-ajax-war/js/portal/slider.js trunk/theme/src/bin/portal-ajax-war/js/portal/unittest.js Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java trunk/theme/build.xml trunk/theme/src/bin/test/theme-test-war/themes/style.css trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java Log: improves how a region is minimal for receiving draggable elements using min-height (with an IE6 hack :-( ) instead of height. Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -75,7 +75,8 @@ PageRendition rendition = (PageRendition)response; Map pageProps = rendition.getPageResult().getPageProperties(); - pageProps.put(DynaConstants.JAVASCRIPT_BASE, "/portal-ajax"); + // + pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax/dyna"); pageProps.put(DynaConstants.OBJECT_ENABLED, "true"); pageProps.put(DynaConstants.ASYNC_SERVER_URL, url); pageProps.put(DynaConstants.VIEW_STATE, viewId); Modified: trunk/theme/build.xml =================================================================== --- trunk/theme/build.xml 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/build.xml 2007-04-06 22:33:41 UTC (rev 6936) @@ -230,6 +230,7 @@ <jar jarfile="${build.lib}/theme-test.war"> <fileset dir="${source.bin}/test/theme-test-war"/> + <fileset dir="${source.bin}/portal-ajax-war" includes="dyna/**"/> <fileset dir="${build.resources}/test/theme-test-war"/> </jar> <jar jarfile="${build.lib}/theme-test.sar"> Copied: trunk/theme/src/bin/portal-ajax-war/dyna/builder.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/builder.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/builder.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/builder.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,131 @@ +// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +var Builder = { + NODEMAP: { + AREA: 'map', + CAPTION: 'table', + COL: 'table', + COLGROUP: 'table', + LEGEND: 'fieldset', + OPTGROUP: 'select', + OPTION: 'select', + PARAM: 'object', + TBODY: 'table', + TD: 'table', + TFOOT: 'table', + TH: 'table', + THEAD: 'table', + TR: 'table' + }, + // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken, + // due to a Firefox bug + node: function(elementName) { + elementName = elementName.toUpperCase(); + + // try innerHTML approach + var parentTag = this.NODEMAP[elementName] || 'div'; + var parentElement = document.createElement(parentTag); + try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707 + parentElement.innerHTML = "<" + elementName + "></" + elementName + ">"; + } catch(e) {} + var element = parentElement.firstChild || null; + + // see if browser added wrapping tags + if(element && (element.tagName.toUpperCase() != elementName)) + element = element.getElementsByTagName(elementName)[0]; + + // fallback to createElement approach + if(!element) element = document.createElement(elementName); + + // abort if nothing could be created + if(!element) return; + + // attributes (or text) + if(arguments[1]) + if(this._isStringOrNumber(arguments[1]) || + (arguments[1] instanceof Array)) { + this._children(element, arguments[1]); + } else { + var attrs = this._attributes(arguments[1]); + if(attrs.length) { + try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707 + parentElement.innerHTML = "<" +elementName + " " + + attrs + "></" + elementName + ">"; + } catch(e) {} + element = parentElement.firstChild || null; + // workaround firefox 1.0.X bug + if(!element) { + element = document.createElement(elementName); + for(attr in arguments[1]) + element[attr == 'class' ? 'className' : attr] = arguments[1][attr]; + } + if(element.tagName.toUpperCase() != elementName) + element = parentElement.getElementsByTagName(elementName)[0]; + } + } + + // text, or array of children + if(arguments[2]) + this._children(element, arguments[2]); + + return element; + }, + _text: function(text) { + return document.createTextNode(text); + }, + + ATTR_MAP: { + 'className': 'class', + 'htmlFor': 'for' + }, + + _attributes: function(attributes) { + var attrs = []; + for(attribute in attributes) + attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) + + '="' + attributes[attribute].toString().escapeHTML() + '"'); + return attrs.join(" "); + }, + _children: function(element, children) { + if(typeof children=='object') { // array can hold nodes and text + children.flatten().each( function(e) { + if(typeof e=='object') + element.appendChild(e) + else + if(Builder._isStringOrNumber(e)) + element.appendChild(Builder._text(e)); + }); + } else + if(Builder._isStringOrNumber(children)) + element.appendChild(Builder._text(children)); + }, + _isStringOrNumber: function(param) { + return(typeof param=='string' || typeof param=='number'); + }, + build: function(html) { + var element = this.node('div'); + $(element).update(html.strip()); + return element.down(); + }, + dump: function(scope) { + if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope + + var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " + + "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " + + "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+ + "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+ + "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+ + "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/); + + tags.each( function(tag){ + scope[tag] = function() { + return Builder.node.apply(Builder, [tag].concat($A(arguments))); + } + }); + } +} Copied: trunk/theme/src/bin/portal-ajax-war/dyna/controls.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/controls.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/controls.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/controls.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,835 @@ +// script.aculo.us controls.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan) +// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) +// Contributors: +// Richard Livsey +// Rahul Bhargava +// Rob Wills +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// Autocompleter.Base handles all the autocompletion functionality +// that's independent of the data source for autocompletion. This +// includes drawing the autocompletion menu, observing keyboard +// and mouse events, and similar. +// +// Specific autocompleters need to provide, at the very least, +// a getUpdatedChoices function that will be invoked every time +// the text inside the monitored textbox changes. This method +// should get the text for which to provide autocompletion by +// invoking this.getToken(), NOT by directly accessing +// this.element.value. This is to allow incremental tokenized +// autocompletion. Specific auto-completion logic (AJAX, etc) +// belongs in getUpdatedChoices. +// +// Tokenized incremental autocompletion is enabled automatically +// when an autocompleter is instantiated with the 'tokens' option +// in the options parameter, e.g.: +// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' }); +// will incrementally autocomplete with a comma as the token. +// Additionally, ',' in the above example can be replaced with +// a token array, e.g. { tokens: [',', '\n'] } which +// enables autocompletion on multiple tokens. This is most +// useful when one of the tokens is \n (a newline), as it +// allows smart autocompletion after linebreaks. + +if(typeof Effect == 'undefined') + throw("controls.js requires including script.aculo.us' effects.js library"); + +var Autocompleter = {} +Autocompleter.Base = function() {}; +Autocompleter.Base.prototype = { + baseInitialize: function(element, update, options) { + this.element = $(element); + this.update = $(update); + this.hasFocus = false; + this.changed = false; + this.active = false; + this.index = 0; + this.entryCount = 0; + + if(this.setOptions) + this.setOptions(options); + else + this.options = options || {}; + + this.options.paramName = this.options.paramName || this.element.name; + this.options.tokens = this.options.tokens || []; + this.options.frequency = this.options.frequency || 0.4; + this.options.minChars = this.options.minChars || 1; + this.options.onShow = this.options.onShow || + function(element, update){ + if(!update.style.position || update.style.position=='absolute') { + update.style.position = 'absolute'; + Position.clone(element, update, { + setHeight: false, + offsetTop: element.offsetHeight + }); + } + Effect.Appear(update,{duration:0.15}); + }; + this.options.onHide = this.options.onHide || + function(element, update){ new Effect.Fade(update,{duration:0.15}) }; + + if(typeof(this.options.tokens) == 'string') + this.options.tokens = new Array(this.options.tokens); + + this.observer = null; + + this.element.setAttribute('autocomplete','off'); + + Element.hide(this.update); + + Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this)); + Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this)); + }, + + show: function() { + if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); + if(!this.iefix && + (navigator.appVersion.indexOf('MSIE')>0) && + (navigator.userAgent.indexOf('Opera')<0) && + (Element.getStyle(this.update, 'position')=='absolute')) { + new Insertion.After(this.update, + '<iframe id="' + this.update.id + '_iefix" '+ + 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + + 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>'); + this.iefix = $(this.update.id+'_iefix'); + } + if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); + }, + + fixIEOverlapping: function() { + Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); + this.iefix.style.zIndex = 1; + this.update.style.zIndex = 2; + Element.show(this.iefix); + }, + + hide: function() { + this.stopIndicator(); + if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update); + if(this.iefix) Element.hide(this.iefix); + }, + + startIndicator: function() { + if(this.options.indicator) Element.show(this.options.indicator); + }, + + stopIndicator: function() { + if(this.options.indicator) Element.hide(this.options.indicator); + }, + + onKeyPress: function(event) { + if(this.active) + switch(event.keyCode) { + case Event.KEY_TAB: + case Event.KEY_RETURN: + this.selectEntry(); + Event.stop(event); + case Event.KEY_ESC: + this.hide(); + this.active = false; + Event.stop(event); + return; + case Event.KEY_LEFT: + case Event.KEY_RIGHT: + return; + case Event.KEY_UP: + this.markPrevious(); + this.render(); + if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event); + return; + case Event.KEY_DOWN: + this.markNext(); + this.render(); + if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event); + return; + } + else + if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || + (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) return; + + this.changed = true; + this.hasFocus = true; + + if(this.observer) clearTimeout(this.observer); + this.observer = + setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); + }, + + activate: function() { + this.changed = false; + this.hasFocus = true; + this.getUpdatedChoices(); + }, + + onHover: function(event) { + var element = Event.findElement(event, 'LI'); + if(this.index != element.autocompleteIndex) + { + this.index = element.autocompleteIndex; + this.render(); + } + Event.stop(event); + }, + + onClick: function(event) { + var element = Event.findElement(event, 'LI'); + this.index = element.autocompleteIndex; + this.selectEntry(); + this.hide(); + }, + + onBlur: function(event) { + // needed to make click events working + setTimeout(this.hide.bind(this), 250); + this.hasFocus = false; + this.active = false; + }, + + render: function() { + if(this.entryCount > 0) { + for (var i = 0; i < this.entryCount; i++) + this.index==i ? + Element.addClassName(this.getEntry(i),"selected") : + Element.removeClassName(this.getEntry(i),"selected"); + + if(this.hasFocus) { + this.show(); + this.active = true; + } + } else { + this.active = false; + this.hide(); + } + }, + + markPrevious: function() { + if(this.index > 0) this.index-- + else this.index = this.entryCount-1; + this.getEntry(this.index).scrollIntoView(true); + }, + + markNext: function() { + if(this.index < this.entryCount-1) this.index++ + else this.index = 0; + this.getEntry(this.index).scrollIntoView(false); + }, + + getEntry: function(index) { + return this.update.firstChild.childNodes[index]; + }, + + getCurrentEntry: function() { + return this.getEntry(this.index); + }, + + selectEntry: function() { + this.active = false; + this.updateElement(this.getCurrentEntry()); + }, + + updateElement: function(selectedElement) { + if (this.options.updateElement) { + this.options.updateElement(selectedElement); + return; + } + var value = ''; + if (this.options.select) { + var nodes = document.getElementsByClassName(this.options.select, selectedElement) || []; + if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); + } else + value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); + + var lastTokenPos = this.findLastToken(); + if (lastTokenPos != -1) { + var newValue = this.element.value.substr(0, lastTokenPos + 1); + var whitespace = this.element.value.substr(lastTokenPos + 1).match(/^\s+/); + if (whitespace) + newValue += whitespace[0]; + this.element.value = newValue + value; + } else { + this.element.value = value; + } + this.element.focus(); + + if (this.options.afterUpdateElement) + this.options.afterUpdateElement(this.element, selectedElement); + }, + + updateChoices: function(choices) { + if(!this.changed && this.hasFocus) { + this.update.innerHTML = choices; + Element.cleanWhitespace(this.update); + Element.cleanWhitespace(this.update.down()); + + if(this.update.firstChild && this.update.down().childNodes) { + this.entryCount = + this.update.down().childNodes.length; + for (var i = 0; i < this.entryCount; i++) { + var entry = this.getEntry(i); + entry.autocompleteIndex = i; + this.addObservers(entry); + } + } else { + this.entryCount = 0; + } + + this.stopIndicator(); + this.index = 0; + + if(this.entryCount==1 && this.options.autoSelect) { + this.selectEntry(); + this.hide(); + } else { + this.render(); + } + } + }, + + addObservers: function(element) { + Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this)); + Event.observe(element, "click", this.onClick.bindAsEventListener(this)); + }, + + onObserverEvent: function() { + this.changed = false; + if(this.getToken().length>=this.options.minChars) { + this.startIndicator(); + this.getUpdatedChoices(); + } else { + this.active = false; + this.hide(); + } + }, + + getToken: function() { + var tokenPos = this.findLastToken(); + if (tokenPos != -1) + var ret = this.element.value.substr(tokenPos + 1).replace(/^\s+/,'').replace(/\s+$/,''); + else + var ret = this.element.value; + + return /\n/.test(ret) ? '' : ret; + }, + + findLastToken: function() { + var lastTokenPos = -1; + + for (var i=0; i<this.options.tokens.length; i++) { + var thisTokenPos = this.element.value.lastIndexOf(this.options.tokens[i]); + if (thisTokenPos > lastTokenPos) + lastTokenPos = thisTokenPos; + } + return lastTokenPos; + } +} + +Ajax.Autocompleter = Class.create(); +Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), { + initialize: function(element, update, url, options) { + this.baseInitialize(element, update, options); + this.options.asynchronous = true; + this.options.onComplete = this.onComplete.bind(this); + this.options.defaultParams = this.options.parameters || null; + this.url = url; + }, + + getUpdatedChoices: function() { + entry = encodeURIComponent(this.options.paramName) + '=' + + encodeURIComponent(this.getToken()); + + this.options.parameters = this.options.callback ? + this.options.callback(this.element, entry) : entry; + + if(this.options.defaultParams) + this.options.parameters += '&' + this.options.defaultParams; + + new Ajax.Request(this.url, this.options); + }, + + onComplete: function(request) { + this.updateChoices(request.responseText); + } + +}); + +// The local array autocompleter. Used when you'd prefer to +// inject an array of autocompletion options into the page, rather +// than sending out Ajax queries, which can be quite slow sometimes. +// +// The constructor takes four parameters. The first two are, as usual, +// the id of the monitored textbox, and id of the autocompletion menu. +// The third is the array you want to autocomplete from, and the fourth +// is the options block. +// +// Extra local autocompletion options: +// - choices - How many autocompletion choices to offer +// +// - partialSearch - If false, the autocompleter will match entered +// text only at the beginning of strings in the +// autocomplete array. Defaults to true, which will +// match text at the beginning of any *word* in the +// strings in the autocomplete array. If you want to +// search anywhere in the string, additionally set +// the option fullSearch to true (default: off). +// +// - fullSsearch - Search anywhere in autocomplete array strings. +// +// - partialChars - How many characters to enter before triggering +// a partial match (unlike minChars, which defines +// how many characters are required to do any match +// at all). Defaults to 2. +// +// - ignoreCase - Whether to ignore case when autocompleting. +// Defaults to true. +// +// It's possible to pass in a custom function as the 'selector' +// option, if you prefer to write your own autocompletion logic. +// In that case, the other options above will not apply unless +// you support them. + +Autocompleter.Local = Class.create(); +Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), { + initialize: function(element, update, array, options) { + this.baseInitialize(element, update, options); + this.options.array = array; + }, + + getUpdatedChoices: function() { + this.updateChoices(this.options.selector(this)); + }, + + setOptions: function(options) { + this.options = Object.extend({ + choices: 10, + partialSearch: true, + partialChars: 2, + ignoreCase: true, + fullSearch: false, + selector: function(instance) { + var ret = []; // Beginning matches + var partial = []; // Inside matches + var entry = instance.getToken(); + var count = 0; + + for (var i = 0; i < instance.options.array.length && + ret.length < instance.options.choices ; i++) { + + var elem = instance.options.array[i]; + var foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase()) : + elem.indexOf(entry); + + while (foundPos != -1) { + if (foundPos == 0 && elem.length != entry.length) { + ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + + elem.substr(entry.length) + "</li>"); + break; + } else if (entry.length >= instance.options.partialChars && + instance.options.partialSearch && foundPos != -1) { + if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { + partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" + + elem.substr(foundPos, entry.length) + "</strong>" + elem.substr( + foundPos + entry.length) + "</li>"); + break; + } + } + + foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : + elem.indexOf(entry, foundPos + 1); + + } + } + if (partial.length) + ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)) + return "<ul>" + ret.join('') + "</ul>"; + } + }, options || {}); + } +}); + +// AJAX in-place editor +// +// see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor + +// Use this if you notice weird scrolling problems on some browsers, +// the DOM might be a bit confused when this gets called so do this +// waits 1 ms (with setTimeout) until it does the activation +Field.scrollFreeActivate = function(field) { + setTimeout(function() { + Field.activate(field); + }, 1); +} + +Ajax.InPlaceEditor = Class.create(); +Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99"; +Ajax.InPlaceEditor.prototype = { + initialize: function(element, url, options) { + this.url = url; + this.element = $(element); + + this.options = Object.extend({ + paramName: "value", + okButton: true, + okText: "ok", + cancelLink: true, + cancelText: "cancel", + savingText: "Saving...", + clickToEditText: "Click to edit", + okText: "ok", + rows: 1, + onComplete: function(transport, element) { + new Effect.Highlight(element, {startcolor: this.options.highlightcolor}); + }, + onFailure: function(transport) { + alert("Error communicating with the server: " + transport.responseText.stripTags()); + }, + callback: function(form) { + return Form.serialize(form); + }, + handleLineBreaks: true, + loadingText: 'Loading...', + savingClassName: 'inplaceeditor-saving', + loadingClassName: 'inplaceeditor-loading', + formClassName: 'inplaceeditor-form', + highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor, + highlightendcolor: "#FFFFFF", + externalControl: null, + submitOnBlur: false, + ajaxOptions: {}, + evalScripts: false + }, options || {}); + + if(!this.options.formId && this.element.id) { + this.options.formId = this.element.id + "-inplaceeditor"; + if ($(this.options.formId)) { + // there's already a form with that name, don't specify an id + this.options.formId = null; + } + } + + if (this.options.externalControl) { + this.options.externalControl = $(this.options.externalControl); + } + + this.originalBackground = Element.getStyle(this.element, 'background-color'); + if (!this.originalBackground) { + this.originalBackground = "transparent"; + } + + this.element.title = this.options.clickToEditText; + + this.onclickListener = this.enterEditMode.bindAsEventListener(this); + this.mouseoverListener = this.enterHover.bindAsEventListener(this); + this.mouseoutListener = this.leaveHover.bindAsEventListener(this); + Event.observe(this.element, 'click', this.onclickListener); + Event.observe(this.element, 'mouseover', this.mouseoverListener); + Event.observe(this.element, 'mouseout', this.mouseoutListener); + if (this.options.externalControl) { + Event.observe(this.options.externalControl, 'click', this.onclickListener); + Event.observe(this.options.externalControl, 'mouseover', this.mouseoverListener); + Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener); + } + }, + enterEditMode: function(evt) { + if (this.saving) return; + if (this.editing) return; + this.editing = true; + this.onEnterEditMode(); + if (this.options.externalControl) { + Element.hide(this.options.externalControl); + } + Element.hide(this.element); + this.createForm(); + this.element.parentNode.insertBefore(this.form, this.element); + if (!this.options.loadTextURL) Field.scrollFreeActivate(this.editField); + // stop the event to avoid a page refresh in Safari + if (evt) { + Event.stop(evt); + } + return false; + }, + createForm: function() { + this.form = document.createElement("form"); + this.form.id = this.options.formId; + Element.addClassName(this.form, this.options.formClassName) + this.form.onsubmit = this.onSubmit.bind(this); + + this.createEditField(); + + if (this.options.textarea) { + var br = document.createElement("br"); + this.form.appendChild(br); + } + + if (this.options.okButton) { + okButton = document.createElement("input"); + okButton.type = "submit"; + okButton.value = this.options.okText; + okButton.className = 'editor_ok_button'; + this.form.appendChild(okButton); + } + + if (this.options.cancelLink) { + cancelLink = document.createElement("a"); + cancelLink.href = "#"; + cancelLink.appendChild(document.createTextNode(this.options.cancelText)); + cancelLink.onclick = this.onclickCancel.bind(this); + cancelLink.className = 'editor_cancel'; + this.form.appendChild(cancelLink); + } + }, + hasHTMLLineBreaks: function(string) { + if (!this.options.handleLineBreaks) return false; + return string.match(/<br/i) || string.match(/<p>/i); + }, + convertHTMLLineBreaks: function(string) { + return string.replace(/<br>/gi, "\n").replace(/<br\/>/gi, "\n").replace(/<\/p>/gi, "\n").replace(/<p>/gi, ""); + }, + createEditField: function() { + var text; + if(this.options.loadTextURL) { + text = this.options.loadingText; + } else { + text = this.getText(); + } + + var obj = this; + + if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) { + this.options.textarea = false; + var textField = document.createElement("input"); + textField.obj = this; + textField.type = "text"; + textField.name = this.options.paramName; + textField.value = text; + textField.style.backgroundColor = this.options.highlightcolor; + textField.className = 'editor_field'; + var size = this.options.size || this.options.cols || 0; + if (size != 0) textField.size = size; + if (this.options.submitOnBlur) + textField.onblur = this.onSubmit.bind(this); + this.editField = textField; + } else { + this.options.textarea = true; + var textArea = document.createElement("textarea"); + textArea.obj = this; + textArea.name = this.options.paramName; + textArea.value = this.convertHTMLLineBreaks(text); + textArea.rows = this.options.rows; + textArea.cols = this.options.cols || 40; + textArea.className = 'editor_field'; + if (this.options.submitOnBlur) + textArea.onblur = this.onSubmit.bind(this); + this.editField = textArea; + } + + if(this.options.loadTextURL) { + this.loadExternalText(); + } + this.form.appendChild(this.editField); + }, + getText: function() { + return this.element.innerHTML; + }, + loadExternalText: function() { + Element.addClassName(this.form, this.options.loadingClassName); + this.editField.disabled = true; + new Ajax.Request( + this.options.loadTextURL, + Object.extend({ + asynchronous: true, + onComplete: this.onLoadedExternalText.bind(this) + }, this.options.ajaxOptions) + ); + }, + onLoadedExternalText: function(transport) { + Element.removeClassName(this.form, this.options.loadingClassName); + this.editField.disabled = false; + this.editField.value = transport.responseText.stripTags(); + Field.scrollFreeActivate(this.editField); + }, + onclickCancel: function() { + this.onComplete(); + this.leaveEditMode(); + return false; + }, + onFailure: function(transport) { + this.options.onFailure(transport); + if (this.oldInnerHTML) { + this.element.innerHTML = this.oldInnerHTML; + this.oldInnerHTML = null; + } + return false; + }, + onSubmit: function() { + // onLoading resets these so we need to save them away for the Ajax call + var form = this.form; + var value = this.editField.value; + + // do this first, sometimes the ajax call returns before we get a chance to switch on Saving... + // which means this will actually switch on Saving... *after* we've left edit mode causing Saving... + // to be displayed indefinitely + this.onLoading(); + + if (this.options.evalScripts) { + new Ajax.Request( + this.url, Object.extend({ + parameters: this.options.callback(form, value), + onComplete: this.onComplete.bind(this), + onFailure: this.onFailure.bind(this), + asynchronous:true, + evalScripts:true + }, this.options.ajaxOptions)); + } else { + new Ajax.Updater( + { success: this.element, + // don't update on failure (this could be an option) + failure: null }, + this.url, Object.extend({ + parameters: this.options.callback(form, value), + onComplete: this.onComplete.bind(this), + onFailure: this.onFailure.bind(this) + }, this.options.ajaxOptions)); + } + // stop the event to avoid a page refresh in Safari + if (arguments.length > 1) { + Event.stop(arguments[0]); + } + return false; + }, + onLoading: function() { + this.saving = true; + this.removeForm(); + this.leaveHover(); + this.showSaving(); + }, + showSaving: function() { + this.oldInnerHTML = this.element.innerHTML; + this.element.innerHTML = this.options.savingText; + Element.addClassName(this.element, this.options.savingClassName); + this.element.style.backgroundColor = this.originalBackground; + Element.show(this.element); + }, + removeForm: function() { + if(this.form) { + if (this.form.parentNode) Element.remove(this.form); + this.form = null; + } + }, + enterHover: function() { + if (this.saving) return; + this.element.style.backgroundColor = this.options.highlightcolor; + if (this.effect) { + this.effect.cancel(); + } + Element.addClassName(this.element, this.options.hoverClassName) + }, + leaveHover: function() { + if (this.options.backgroundColor) { + this.element.style.backgroundColor = this.oldBackground; + } + Element.removeClassName(this.element, this.options.hoverClassName) + if (this.saving) return; + this.effect = new Effect.Highlight(this.element, { + startcolor: this.options.highlightcolor, + endcolor: this.options.highlightendcolor, + restorecolor: this.originalBackground + }); + }, + leaveEditMode: function() { + Element.removeClassName(this.element, this.options.savingClassName); + this.removeForm(); + this.leaveHover(); + this.element.style.backgroundColor = this.originalBackground; + Element.show(this.element); + if (this.options.externalControl) { + Element.show(this.options.externalControl); + } + this.editing = false; + this.saving = false; + this.oldInnerHTML = null; + this.onLeaveEditMode(); + }, + onComplete: function(transport) { + this.leaveEditMode(); + this.options.onComplete.bind(this)(transport, this.element); + }, + onEnterEditMode: function() {}, + onLeaveEditMode: function() {}, + dispose: function() { + if (this.oldInnerHTML) { + this.element.innerHTML = this.oldInnerHTML; + } + this.leaveEditMode(); + Event.stopObserving(this.element, 'click', this.onclickListener); + Event.stopObserving(this.element, 'mouseover', this.mouseoverListener); + Event.stopObserving(this.element, 'mouseout', this.mouseoutListener); + if (this.options.externalControl) { + Event.stopObserving(this.options.externalControl, 'click', this.onclickListener); + Event.stopObserving(this.options.externalControl, 'mouseover', this.mouseoverListener); + Event.stopObserving(this.options.externalControl, 'mouseout', this.mouseoutListener); + } + } +}; + +Ajax.InPlaceCollectionEditor = Class.create(); +Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype); +Object.extend(Ajax.InPlaceCollectionEditor.prototype, { + createEditField: function() { + if (!this.cached_selectTag) { + var selectTag = document.createElement("select"); + var collection = this.options.collection || []; + var optionTag; + collection.each(function(e,i) { + optionTag = document.createElement("option"); + optionTag.value = (e instanceof Array) ? e[0] : e; + if((typeof this.options.value == 'undefined') && + ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true; + if(this.options.value==optionTag.value) optionTag.selected = true; + optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e)); + selectTag.appendChild(optionTag); + }.bind(this)); + this.cached_selectTag = selectTag; + } + + this.editField = this.cached_selectTag; + if(this.options.loadTextURL) this.loadExternalText(); + this.form.appendChild(this.editField); + this.options.callback = function(form, value) { + return "value=" + encodeURIComponent(value); + } + } +}); + +// Delayed observer, like Form.Element.Observer, +// but waits for delay after last key input +// Ideal for live-search fields + +Form.Element.DelayedObserver = Class.create(); +Form.Element.DelayedObserver.prototype = { + initialize: function(element, delay, callback) { + this.delay = delay || 0.5; + this.element = $(element); + this.callback = callback; + this.timer = null; + this.lastValue = $F(this.element); + Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); + }, + delayedListener: function(event) { + if(this.lastValue == $F(this.element)) return; + if(this.timer) clearTimeout(this.timer); + this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000); + this.lastValue = $F(this.element); + }, + onTimerEvent: function() { + this.timer = null; + this.callback(this.element, $F(this.element)); + } +}; Copied: trunk/theme/src/bin/portal-ajax-war/dyna/dragdrop.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/dragdrop.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dragdrop.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dragdrop.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,944 @@ +// script.aculo.us dragdrop.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi(a)oriontransfer.co.nz) +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +if(typeof Effect == 'undefined') + throw("dragdrop.js requires including script.aculo.us' effects.js library"); + +var Droppables = { + drops: [], + + remove: function(element) { + this.drops = this.drops.reject(function(d) { return d.element==$(element) }); + }, + + add: function(element) { + element = $(element); + var options = Object.extend({ + greedy: true, + hoverclass: null, + tree: false + }, arguments[1] || {}); + + // cache containers + if(options.containment) { + options._containers = []; + var containment = options.containment; + if((typeof containment == 'object') && + (containment.constructor == Array)) { + containment.each( function(c) { options._containers.push($(c)) }); + } else { + options._containers.push($(containment)); + } + } + + if(options.accept) options.accept = [options.accept].flatten(); + + Element.makePositioned(element); // fix IE + options.element = element; + + this.drops.push(options); + }, + + findDeepestChild: function(drops) { + deepest = drops[0]; + + for (i = 1; i < drops.length; ++i) + if (Element.isParent(drops[i].element, deepest.element)) + deepest = drops[i]; + + return deepest; + }, + + isContained: function(element, drop) { + var containmentNode; + if(drop.tree) { + containmentNode = element.treeNode; + } else { + containmentNode = element.parentNode; + } + return drop._containers.detect(function(c) { return containmentNode == c }); + }, + + isAffected: function(point, element, drop) { + return ( + (drop.element!=element) && + ((!drop._containers) || + this.isContained(element, drop)) && + ((!drop.accept) || + (Element.classNames(element).detect( + function(v) { return drop.accept.include(v) } ) )) && + Position.within(drop.element, point[0], point[1]) ); + }, + + deactivate: function(drop) { + if(drop.hoverclass) + Element.removeClassName(drop.element, drop.hoverclass); + this.last_active = null; + }, + + activate: function(drop) { + if(drop.hoverclass) + Element.addClassName(drop.element, drop.hoverclass); + this.last_active = drop; + }, + + show: function(point, element) { + if(!this.drops.length) return; + var affected = []; + + if(this.last_active) this.deactivate(this.last_active); + this.drops.each( function(drop) { + if(Droppables.isAffected(point, element, drop)) + affected.push(drop); + }); + + if(affected.length>0) { + drop = Droppables.findDeepestChild(affected); + Position.within(drop.element, point[0], point[1]); + if(drop.onHover) + drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); + + Droppables.activate(drop); + } + }, + + fire: function(event, element) { + if(!this.last_active) return; + Position.prepare(); + + if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) + if (this.last_active.onDrop) + this.last_active.onDrop(element, this.last_active.element, event); + }, + + reset: function() { + if(this.last_active) + this.deactivate(this.last_active); + } +} + +var Draggables = { + drags: [], + observers: [], + + register: function(draggable) { + if(this.drags.length == 0) { + this.eventMouseUp = this.endDrag.bindAsEventListener(this); + this.eventMouseMove = this.updateDrag.bindAsEventListener(this); + this.eventKeypress = this.keyPress.bindAsEventListener(this); + + Event.observe(document, "mouseup", this.eventMouseUp); + Event.observe(document, "mousemove", this.eventMouseMove); + Event.observe(document, "keypress", this.eventKeypress); + } + this.drags.push(draggable); + }, + + unregister: function(draggable) { + this.drags = this.drags.reject(function(d) { return d==draggable }); + if(this.drags.length == 0) { + Event.stopObserving(document, "mouseup", this.eventMouseUp); + Event.stopObserving(document, "mousemove", this.eventMouseMove); + Event.stopObserving(document, "keypress", this.eventKeypress); + } + }, + + activate: function(draggable) { + if(draggable.options.delay) { + this._timeout = setTimeout(function() { + Draggables._timeout = null; + window.focus(); + Draggables.activeDraggable = draggable; + }.bind(this), draggable.options.delay); + } else { + window.focus(); // allows keypress events if window isn't currently focused, fails for Safari + this.activeDraggable = draggable; + } + }, + + deactivate: function() { + this.activeDraggable = null; + }, + + updateDrag: function(event) { + if(!this.activeDraggable) return; + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + // Mozilla-based browsers fire successive mousemove events with + // the same coordinates, prevent needless redrawing (moz bug?) + if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; + this._lastPointer = pointer; + + this.activeDraggable.updateDrag(event, pointer); + }, + + endDrag: function(event) { + if(this._timeout) { + clearTimeout(this._timeout); + this._timeout = null; + } + if(!this.activeDraggable) return; + this._lastPointer = null; + this.activeDraggable.endDrag(event); + this.activeDraggable = null; + }, + + keyPress: function(event) { + if(this.activeDraggable) + this.activeDraggable.keyPress(event); + }, + + addObserver: function(observer) { + this.observers.push(observer); + this._cacheObserverCallbacks(); + }, + + removeObserver: function(element) { // element instead of observer fixes mem leaks + this.observers = this.observers.reject( function(o) { return o.element==element }); + this._cacheObserverCallbacks(); + }, + + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' + if(this[eventName+'Count'] > 0) + this.observers.each( function(o) { + if(o[eventName]) o[eventName](eventName, draggable, event); + }); + if(draggable.options[eventName]) draggable.options[eventName](draggable, event); + }, + + _cacheObserverCallbacks: function() { + ['onStart','onEnd','onDrag'].each( function(eventName) { + Draggables[eventName+'Count'] = Draggables.observers.select( + function(o) { return o[eventName]; } + ).length; + }); + } +} + +/*--------------------------------------------------------------------------*/ + +var Draggable = Class.create(); +Draggable._dragging = {}; + +Draggable.prototype = { + initialize: function(element) { + var defaults = { + handle: false, + reverteffect: function(element, top_offset, left_offset) { + var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; + new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur, + queue: {scope:'_draggable', position:'end'} + }); + }, + endeffect: function(element) { + var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0; + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, + queue: {scope:'_draggable', position:'end'}, + afterFinish: function(){ + Draggable._dragging[element] = false + } + }); + }, + zindex: 1000, + revert: false, + scroll: false, + scrollSensitivity: 20, + scrollSpeed: 15, + snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } + delay: 0 + }; + + if(!arguments[1] || typeof arguments[1].endeffect == 'undefined') + Object.extend(defaults, { + starteffect: function(element) { + element._opacity = Element.getOpacity(element); + Draggable._dragging[element] = true; + new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); + } + }); + + var options = Object.extend(defaults, arguments[1] || {}); + + this.element = $(element); + + if(options.handle && (typeof options.handle == 'string')) + this.handle = this.element.down('.'+options.handle, 0); + + if(!this.handle) this.handle = $(options.handle); + if(!this.handle) this.handle = this.element; + + if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { + options.scroll = $(options.scroll); + this._isScrollChild = Element.childOf(this.element, options.scroll); + } + + Element.makePositioned(this.element); // fix IE + + this.delta = this.currentDelta(); + this.options = options; + this.dragging = false; + + this.eventMouseDown = this.initDrag.bindAsEventListener(this); + Event.observe(this.handle, "mousedown", this.eventMouseDown); + + Draggables.register(this); + }, + + destroy: function() { + Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); + Draggables.unregister(this); + }, + + currentDelta: function() { + return([ + parseInt(Element.getStyle(this.element,'left') || '0'), + parseInt(Element.getStyle(this.element,'top') || '0')]); + }, + + initDrag: function(event) { + if(typeof Draggable._dragging[this.element] != 'undefined' && + Draggable._dragging[this.element]) return; + if(Event.isLeftClick(event)) { + // abort on form elements, fixes a Firefox issue + var src = Event.element(event); + if((tag_name = src.tagName.toUpperCase()) && ( + tag_name=='INPUT' || + tag_name=='SELECT' || + tag_name=='OPTION' || + tag_name=='BUTTON' || + tag_name=='TEXTAREA')) return; + + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + var pos = Position.cumulativeOffset(this.element); + this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); + + Draggables.activate(this); + Event.stop(event); + } + }, + + startDrag: function(event) { + this.dragging = true; + + if(this.options.zindex) { + this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); + this.element.style.zIndex = this.options.zindex; + } + + if(this.options.ghosting) { + this._clone = this.element.cloneNode(true); + Position.absolutize(this.element); + this.element.parentNode.insertBefore(this._clone, this.element); + } + + if(this.options.scroll) { + if (this.options.scroll == window) { + var where = this._getWindowScroll(this.options.scroll); + this.originalScrollLeft = where.left; + this.originalScrollTop = where.top; + } else { + this.originalScrollLeft = this.options.scroll.scrollLeft; + this.originalScrollTop = this.options.scroll.scrollTop; + } + } + + Draggables.notify('onStart', this, event); + + if(this.options.starteffect) this.options.starteffect(this.element); + }, + + updateDrag: function(event, pointer) { + if(!this.dragging) this.startDrag(event); + Position.prepare(); + Droppables.show(pointer, this.element); + Draggables.notify('onDrag', this, event); + + this.draw(pointer); + if(this.options.change) this.options.change(this); + + if(this.options.scroll) { + this.stopScrolling(); + + var p; + if (this.options.scroll == window) { + with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } + } else { + p = Position.page(this.options.scroll); + p[0] += this.options.scroll.scrollLeft + Position.deltaX; + p[1] += this.options.scroll.scrollTop + Position.deltaY; + p.push(p[0]+this.options.scroll.offsetWidth); + p.push(p[1]+this.options.scroll.offsetHeight); + } + var speed = [0,0]; + if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity); + if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity); + if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity); + if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); + this.startScrolling(speed); + } + + // fix AppleWebKit rendering + if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); + + Event.stop(event); + }, + + finishDrag: function(event, success) { + this.dragging = false; + + if(this.options.ghosting) { + Position.relativize(this.element); + Element.remove(this._clone); + this._clone = null; + } + + if(success) Droppables.fire(event, this.element); + Draggables.notify('onEnd', this, event); + + var revert = this.options.revert; + if(revert && typeof revert == 'function') revert = revert(this.element); + + var d = this.currentDelta(); + if(revert && this.options.reverteffect) { + this.options.reverteffect(this.element, + d[1]-this.delta[1], d[0]-this.delta[0]); + } else { + this.delta = d; + } + + if(this.options.zindex) + this.element.style.zIndex = this.originalZ; + + if(this.options.endeffect) + this.options.endeffect(this.element); + + Draggables.deactivate(this); + Droppables.reset(); + }, + + keyPress: function(event) { + if(event.keyCode!=Event.KEY_ESC) return; + this.finishDrag(event, false); + Event.stop(event); + }, + + endDrag: function(event) { + if(!this.dragging) return; + this.stopScrolling(); + this.finishDrag(event, true); + Event.stop(event); + }, + + draw: function(point) { + var pos = Position.cumulativeOffset(this.element); + if(this.options.ghosting) { + var r = Position.realOffset(this.element); + pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; + } + + var d = this.currentDelta(); + pos[0] -= d[0]; pos[1] -= d[1]; + + if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { + pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; + pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; + } + + var p = [0,1].map(function(i){ + return (point[i]-pos[i]-this.offset[i]) + }.bind(this)); + + if(this.options.snap) { + if(typeof this.options.snap == 'function') { + p = this.options.snap(p[0],p[1],this); + } else { + if(this.options.snap instanceof Array) { + p = p.map( function(v, i) { + return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this)) + } else { + p = p.map( function(v) { + return Math.round(v/this.options.snap)*this.options.snap }.bind(this)) + } + }} + + var style = this.element.style; + if((!this.options.constraint) || (this.options.constraint=='horizontal')) + style.left = p[0] + "px"; + if((!this.options.constraint) || (this.options.constraint=='vertical')) + style.top = p[1] + "px"; + + if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering + }, + + stopScrolling: function() { + if(this.scrollInterval) { + clearInterval(this.scrollInterval); + this.scrollInterval = null; + Draggables._lastScrollPointer = null; + } + }, + + startScrolling: function(speed) { + if(!(speed[0] || speed[1])) return; + this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; + this.lastScrolled = new Date(); + this.scrollInterval = setInterval(this.scroll.bind(this), 10); + }, + + scroll: function() { + var current = new Date(); + var delta = current - this.lastScrolled; + this.lastScrolled = current; + if(this.options.scroll == window) { + with (this._getWindowScroll(this.options.scroll)) { + if (this.scrollSpeed[0] || this.scrollSpeed[1]) { + var d = delta / 1000; + this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] ); + } + } + } else { + this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; + this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; + } + + Position.prepare(); + Droppables.show(Draggables._lastPointer, this.element); + Draggables.notify('onDrag', this); + if (this._isScrollChild) { + Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer); + Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000; + Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000; + if (Draggables._lastScrollPointer[0] < 0) + Draggables._lastScrollPointer[0] = 0; + if (Draggables._lastScrollPointer[1] < 0) + Draggables._lastScrollPointer[1] = 0; + this.draw(Draggables._lastScrollPointer); + } + + if(this.options.change) this.options.change(this); + }, + + _getWindowScroll: function(w) { + var T, L, W, H; + with (w.document) { + if (w.document.documentElement && documentElement.scrollTop) { + T = documentElement.scrollTop; + L = documentElement.scrollLeft; + } else if (w.document.body) { + T = body.scrollTop; + L = body.scrollLeft; + } + if (w.innerWidth) { + W = w.innerWidth; + H = w.innerHeight; + } else if (w.document.documentElement && documentElement.clientWidth) { + W = documentElement.clientWidth; + H = documentElement.clientHeight; + } else { + W = body.offsetWidth; + H = body.offsetHeight + } + } + return { top: T, left: L, width: W, height: H }; + } +} + +/*--------------------------------------------------------------------------*/ + +var SortableObserver = Class.create(); +SortableObserver.prototype = { + initialize: function(element, observer) { + this.element = $(element); + this.observer = observer; + this.lastValue = Sortable.serialize(this.element); + }, + + onStart: function() { + this.lastValue = Sortable.serialize(this.element); + }, + + onEnd: function() { + Sortable.unmark(); + if(this.lastValue != Sortable.serialize(this.element)) + this.observer(this.element) + } +} + +var Sortable = { + SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, + + sortables: {}, + + _findRootElement: function(element) { + while (element.tagName.toUpperCase() != "BODY") { + if(element.id && Sortable.sortables[element.id]) return element; + element = element.parentNode; + } + }, + + options: function(element) { + element = Sortable._findRootElement($(element)); + if(!element) return; + return Sortable.sortables[element.id]; + }, + + destroy: function(element){ + var s = Sortable.options(element); + + if(s) { + Draggables.removeObserver(s.element); + s.droppables.each(function(d){ Droppables.remove(d) }); + s.draggables.invoke('destroy'); + + delete Sortable.sortables[s.element.id]; + } + }, + + create: function(element) { + element = $(element); + var options = Object.extend({ + element: element, + tag: 'li', // assumes li children, override with tag: 'tagname' + dropOnEmpty: false, + tree: false, + treeTag: 'ul', + overlap: 'vertical', // one of 'vertical', 'horizontal' + constraint: 'vertical', // one of 'vertical', 'horizontal', false + containment: element, // also takes array of elements (or id's); or false + handle: false, // or a CSS class + only: false, + delay: 0, + hoverclass: null, + ghosting: false, + scroll: false, + scrollSensitivity: 20, + scrollSpeed: 15, + format: this.SERIALIZE_RULE, + onChange: Prototype.emptyFunction, + onUpdate: Prototype.emptyFunction + }, arguments[1] || {}); + + // clear any old sortable with same element + this.destroy(element); + + // build options for the draggables + var options_for_draggable = { + revert: true, + scroll: options.scroll, + scrollSpeed: options.scrollSpeed, + scrollSensitivity: options.scrollSensitivity, + delay: options.delay, + ghosting: options.ghosting, + constraint: options.constraint, + handle: options.handle }; + + if(options.starteffect) + options_for_draggable.starteffect = options.starteffect; + + if(options.reverteffect) + options_for_draggable.reverteffect = options.reverteffect; + else + if(options.ghosting) options_for_draggable.reverteffect = function(element) { + element.style.top = 0; + element.style.left = 0; + }; + + if(options.endeffect) + options_for_draggable.endeffect = options.endeffect; + + if(options.zindex) + options_for_draggable.zindex = options.zindex; + + // build options for the droppables + var options_for_droppable = { + overlap: options.overlap, + containment: options.containment, + tree: options.tree, + hoverclass: options.hoverclass, + onHover: Sortable.onHover + } + + var options_for_tree = { + onHover: Sortable.onEmptyHover, + overlap: options.overlap, + containment: options.containment, + hoverclass: options.hoverclass + } + + // fix for gecko engine + Element.cleanWhitespace(element); + + options.draggables = []; + options.droppables = []; + + // drop on empty handling + if(options.dropOnEmpty || options.tree) { + Droppables.add(element, options_for_tree); + options.droppables.push(element); + } + + (this.findElements(element, options) || []).each( function(e) { + // handles are per-draggable + var handle = options.handle ? + $(e).down('.'+options.handle,0) : e; + options.draggables.push( + new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); + Droppables.add(e, options_for_droppable); + if(options.tree) e.treeNode = element; + options.droppables.push(e); + }); + + if(options.tree) { + (Sortable.findTreeElements(element, options) || []).each( function(e) { + Droppables.add(e, options_for_tree); + e.treeNode = element; + options.droppables.push(e); + }); + } + + // keep reference + this.sortables[element.id] = options; + + // for onupdate + Draggables.addObserver(new SortableObserver(element, options.onUpdate)); + + }, + + // return all suitable-for-sortable elements in a guaranteed order + findElements: function(element, options) { + return Element.findChildren( + element, options.only, options.tree ? true : false, options.tag); + }, + + findTreeElements: function(element, options) { + return Element.findChildren( + element, options.only, options.tree ? true : false, options.treeTag); + }, + + onHover: function(element, dropon, overlap) { + if(Element.isParent(dropon, element)) return; + + if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) { + return; + } else if(overlap>0.5) { + Sortable.mark(dropon, 'before'); + if(dropon.previousSibling != element) { + var oldParentNode = element.parentNode; + element.style.visibility = "hidden"; // fix gecko rendering + dropon.parentNode.insertBefore(element, dropon); + if(dropon.parentNode!=oldParentNode) + Sortable.options(oldParentNode).onChange(element); + Sortable.options(dropon.parentNode).onChange(element); + } + } else { + Sortable.mark(dropon, 'after'); + var nextElement = dropon.nextSibling || null; + if(nextElement != element) { + var oldParentNode = element.parentNode; + element.style.visibility = "hidden"; // fix gecko rendering + dropon.parentNode.insertBefore(element, nextElement); + if(dropon.parentNode!=oldParentNode) + Sortable.options(oldParentNode).onChange(element); + Sortable.options(dropon.parentNode).onChange(element); + } + } + }, + + onEmptyHover: function(element, dropon, overlap) { + var oldParentNode = element.parentNode; + var droponOptions = Sortable.options(dropon); + + if(!Element.isParent(dropon, element)) { + var index; + + var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); + var child = null; + + if(children) { + var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); + + for (index = 0; index < children.length; index += 1) { + if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { + offset -= Element.offsetSize (children[index], droponOptions.overlap); + } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) { + child = index + 1 < children.length ? children[index + 1] : null; + break; + } else { + child = children[index]; + break; + } + } + } + + dropon.insertBefore(element, child); + + Sortable.options(oldParentNode).onChange(element); + droponOptions.onChange(element); + } + }, + + unmark: function() { + if(Sortable._marker) Sortable._marker.hide(); + }, + + mark: function(dropon, position) { + // mark on ghosting only + var sortable = Sortable.options(dropon.parentNode); + if(sortable && !sortable.ghosting) return; + + if(!Sortable._marker) { + Sortable._marker = + ($('dropmarker') || Element.extend(document.createElement('DIV'))). + hide().addClassName('dropmarker').setStyle({position:'absolute'}); + document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); + } + var offsets = Position.cumulativeOffset(dropon); + Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); + + if(position=='after') + if(sortable.overlap == 'horizontal') + Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); + else + Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); + + Sortable._marker.show(); + }, + + _tree: function(element, options, parent) { + var children = Sortable.findElements(element, options) || []; + + for (var i = 0; i < children.length; ++i) { + var match = children[i].id.match(options.format); + + if (!match) continue; + + var child = { + id: encodeURIComponent(match ? match[1] : null), + element: element, + parent: parent, + children: [], + position: parent.children.length, + container: $(children[i]).down(options.treeTag) + } + + /* Get the element containing the children and recurse over it */ + if (child.container) + this._tree(child.container, options, child) + + parent.children.push (child); + } + + return parent; + }, + + tree: function(element) { + element = $(element); + var sortableOptions = this.options(element); + var options = Object.extend({ + tag: sortableOptions.tag, + treeTag: sortableOptions.treeTag, + only: sortableOptions.only, + name: element.id, + format: sortableOptions.format + }, arguments[1] || {}); + + var root = { + id: null, + parent: null, + children: [], + container: element, + position: 0 + } + + return Sortable._tree(element, options, root); + }, + + /* Construct a [i] index for a particular node */ + _constructIndex: function(node) { + var index = ''; + do { + if (node.id) index = '[' + node.position + ']' + index; + } while ((node = node.parent) != null); + return index; + }, + + sequence: function(element) { + element = $(element); + var options = Object.extend(this.options(element), arguments[1] || {}); + + return $(this.findElements(element, options) || []).map( function(item) { + return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; + }); + }, + + setSequence: function(element, new_sequence) { + element = $(element); + var options = Object.extend(this.options(element), arguments[2] || {}); + + var nodeMap = {}; + this.findElements(element, options).each( function(n) { + if (n.id.match(options.format)) + nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; + n.parentNode.removeChild(n); + }); + + new_sequence.each(function(ident) { + var n = nodeMap[ident]; + if (n) { + n[1].appendChild(n[0]); + delete nodeMap[ident]; + } + }); + }, + + serialize: function(element) { + element = $(element); + var options = Object.extend(Sortable.options(element), arguments[1] || {}); + var name = encodeURIComponent( + (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); + + if (options.tree) { + return Sortable.tree(element, arguments[1]).children.map( function (item) { + return [name + Sortable._constructIndex(item) + "[id]=" + + encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); + }).flatten().join('&'); + } else { + return Sortable.sequence(element, arguments[1]).map( function(item) { + return name + "[]=" + encodeURIComponent(item); + }).join('&'); + } + } +} + +// Returns true if child is contained within element +Element.isParent = function(child, element) { + if (!child.parentNode || child == element) return false; + if (child.parentNode == element) return true; + return Element.isParent(child.parentNode, element); +} + +Element.findChildren = function(element, only, recursive, tagName) { + if(!element.hasChildNodes()) return null; + tagName = tagName.toUpperCase(); + if(only) only = [only].flatten(); + var elements = []; + $A(element.childNodes).each( function(e) { + if(e.tagName && e.tagName.toUpperCase()==tagName && + (!only || (Element.classNames(e).detect(function(v) { return only.include(v) })))) + elements.push(e); + if(recursive) { + var grandchildren = Element.findChildren(e, only, recursive, tagName); + if(grandchildren) elements.push(grandchildren); + } + }); + + return (elements.length>0 ? elements.flatten() : []); +} + +Element.offsetSize = function (element, type) { + return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; +} Copied: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,228 @@ +function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) { + var options = { + requestHeaders: ["ajax","true"], + method: "post", + postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId, + onSuccess: function(t) + { + }, + on404: function(t) + { + alert("Error 404: location " + t.statusText + " was not found."); + }, + onFailure: function(t) + { + alert("Error " + t.status + " -- " + t.statusText); + }, + onLoading: function(t) + { + } + } + new Ajax.Request(async_server_url, options); +} + +function snapshot() { + + // Find draggable regions + var regions_on_page = document.getElementsByClassName("dyna-region"); + + // Save current state in the DOM itself + for(var i = 0;i < regions_on_page.length;i++) { + var regionDiv = regions_on_page[i] + for (var j = 0;j < regionDiv.childNodes.length;j++) { + var child = regionDiv.childNodes[j]; + child["regionId"] = regionDiv.id; + child["pos"] = j; + } + } +} + +function bilto(event) +{ + + // Locate the div container of the window + var source = Event.element(event); + var container = Element.up(source, "div.dyna-window"); + + // We found the window + if (container != null) { + + + var form = source.nodeName == "FORM"; + var link = !form & source.nodeName == "A"; + + var url; + var body; + var method; + + if (source.nodeName == "A") + { + url = source.href; + method = "get"; + body = ""; + } + else if (source.nodeName == "INPUT" && source.type == "submit") + { + // Find enclosing form + var current = source.parentNode; + while (current.nodeName != 'FORM' && current.nodeName != 'BODY') { + current = current.parentNode; + } + + // Check we have a form and use it + if (current.nodeName == 'FORM') { + + // + url = current.action; + + // Get body if needed + if (current.method.toLowerCase() == "post") { + body = Form.serialize(current); + method = "post"; + } + else + { + body = ""; + method = "get"; + } + } + } + + // Handle links here + if (url != null) { + // + var headers = ["ajax","true"]; + if (view_state !== undefined) + { + headers.view_state = view_state; + } + + // note : we don't convert query string to prototype parameters as in the case + // of a post, the parameters will be appended to the body of the query which + // will lead to a non correct request + + // If we process a form then we will perform a blocking interaction + var asynchronous = !form; + + // + var options = { + asynchronous:asynchronous, + method: method, + postBody: body, + requestHeaders:headers, + onSuccess: function(t) + { + var resp = ""; + eval("resp =" + t.responseText + ";"); + if (resp.type == "update_markup") + { + // Iterate all changes + for (var id in resp.fragments) + { + var matchingElt = document.getElementById(id); + + // Different than 1 is not good + if (matchingElt != null) + { + var markup = resp.fragments[id]; + markup = markup.substring(25, markup.length - 7); + + var markupContainer = Element.up(matchingElt); + markupContainer.innerHTML = markup; + } + } + + // update view state + view_state = resp.view_state; + } + else if (resp.type == "update_page") + { + document.location = resp.location; + } + } + }; + + // Add the form post body + // todo : detect file upload + if (form) + { + options.postBody = Form.serialize(source); + } + + // + Event.stop(event); + new Ajax.Request(url, options); + } + + } + +} + + +function footer() +{ + // + var WindowMoveObserver = Class.create(); + WindowMoveObserver.prototype = + { + initialize: function(element) + { + this.element = $(element); + }, + onStart: function() + { + }, + onEnd: function() + { + var elt = Draggables.activeDraggable.element; + + // + var windowId = Element.down(elt).id; + var fromRegionId = elt["regionId"]; + var fromPos = elt["pos"]; + + // Doing the snapshot after move will give us the new region and pos of the window + snapshot(); + var toRegionId = elt["regionId"]; + var toPos = elt["pos"]; + + // Perform request + sendData("windowmove", windowId, fromPos, fromRegionId, toPos, toRegionId); + } + }; + + // Find the draggable regions + var regions_on_page = document.getElementsByClassName("dyna-region"); + + // Create draggable regions + for(var i = 0;i < regions_on_page.length;i++) { + var region = regions_on_page[i]; + Sortable.create(region, {dropOnEmpty:true,handle:"handle",tag:"div",containment:regions_on_page,constraint:false}); + } + + // + Draggables.addObserver(new WindowMoveObserver()); + snapshot(); + + // Find the dyna portlets + var portlets_on_page = document.getElementsByClassName("dyna-window"); + + // Add listener for the dyna windows + for(var i = 0;i < portlets_on_page.length;i++) { + var portlet = portlets_on_page[i]; + Event.observe(portlet, "click", bilto); + } +} + + +// String u = "" + +// "function removeWindow(elementId)\n" + +// "{\n" + +// " var effectElement = document.getElementById(elementId)\n" + +// " new Effect.BlindUp(effectElement);\n" + +// "\n" + +// " //removeElement(effectElement);\n" + +// "\n" + +// " sendData('windowremove', elementId);\n" + +// "}\n"; +// markup.append(u); Copied: trunk/theme/src/bin/portal-ajax-war/dyna/effects.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/effects.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/effects.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/effects.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,1090 @@ +// script.aculo.us effects.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Contributors: +// Justin Palmer (http://encytemedia.com/) +// Mark Pilgrim (http://diveintomark.org/) +// Martin Bialasinki +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// converts rgb() and #xxx to #xxxxxx format, +// returns self (or first argument) if not convertable +String.prototype.parseColor = function() { + var color = '#'; + if(this.slice(0,4) == 'rgb(') { + var cols = this.slice(4,this.length-1).split(','); + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); + } else { + if(this.slice(0,1) == '#') { + if(this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); + if(this.length==7) color = this.toLowerCase(); + } + } + return(color.length==7 ? color : (arguments[0] || this)); +} + +/*--------------------------------------------------------------------------*/ + +Element.collectTextNodes = function(element) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); + }).flatten().join(''); +} + +Element.collectTextNodesIgnoreClass = function(element, className) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? + Element.collectTextNodesIgnoreClass(node, className) : '')); + }).flatten().join(''); +} + +Element.setContentZoom = function(element, percent) { + element = $(element); + element.setStyle({fontSize: (percent/100) + 'em'}); + if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); + return element; +} + +Element.getOpacity = function(element){ + return $(element).getStyle('opacity'); +} + +Element.setOpacity = function(element, value){ + return $(element).setStyle({opacity:value}); +} + +Element.getInlineOpacity = function(element){ + return $(element).style.opacity || ''; +} + +Element.forceRerendering = function(element) { + try { + element = $(element); + var n = document.createTextNode(' '); + element.appendChild(n); + element.removeChild(n); + } catch(e) { } +}; + +/*--------------------------------------------------------------------------*/ + +Array.prototype.call = function() { + var args = arguments; + this.each(function(f){ f.apply(this, args) }); +} + +/*--------------------------------------------------------------------------*/ + +var Effect = { + _elementDoesNotExistError: { + name: 'ElementDoesNotExistError', + message: 'The specified DOM element does not exist, but is required for this effect to operate' + }, + tagifyText: function(element) { + if(typeof Builder == 'undefined') + throw("Effect.tagifyText requires including script.aculo.us' builder.js library"); + + var tagifyStyle = 'position:relative'; + if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1'; + + element = $(element); + $A(element.childNodes).each( function(child) { + if(child.nodeType==3) { + child.nodeValue.toArray().each( function(character) { + element.insertBefore( + Builder.node('span',{style: tagifyStyle}, + character == ' ' ? String.fromCharCode(160) : character), + child); + }); + Element.remove(child); + } + }); + }, + multiple: function(element, effect) { + var elements; + if(((typeof element == 'object') || + (typeof element == 'function')) && + (element.length)) + elements = element; + else + elements = $(element).childNodes; + + var options = Object.extend({ + speed: 0.1, + delay: 0.0 + }, arguments[2] || {}); + var masterDelay = options.delay; + + $A(elements).each( function(element, index) { + new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay })); + }); + }, + PAIRS: { + 'slide': ['SlideDown','SlideUp'], + 'blind': ['BlindDown','BlindUp'], + 'appear': ['Appear','Fade'] + }, + toggle: function(element, effect) { + element = $(element); + effect = (effect || 'appear').toLowerCase(); + var options = Object.extend({ + queue: { position:'end', scope:(element.id || 'global'), limit: 1 } + }, arguments[2] || {}); + Effect[element.visible() ? + Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); + } +}; + +var Effect2 = Effect; // deprecated + +/* ------------- transitions ------------- */ + +Effect.Transitions = { + linear: Prototype.K, + sinoidal: function(pos) { + return (-Math.cos(pos*Math.PI)/2) + 0.5; + }, + reverse: function(pos) { + return 1-pos; + }, + flicker: function(pos) { + return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4; + }, + wobble: function(pos) { + return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5; + }, + pulse: function(pos, pulses) { + pulses = pulses || 5; + return ( + Math.round((pos % (1/pulses)) * pulses) == 0 ? + ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) : + 1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) + ); + }, + none: function(pos) { + return 0; + }, + full: function(pos) { + return 1; + } +}; + +/* ------------- core effects ------------- */ + +Effect.ScopedQueue = Class.create(); +Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), { + initialize: function() { + this.effects = []; + this.interval = null; + }, + _each: function(iterator) { + this.effects._each(iterator); + }, + add: function(effect) { + var timestamp = new Date().getTime(); + + var position = (typeof effect.options.queue == 'string') ? + effect.options.queue : effect.options.queue.position; + + switch(position) { + case 'front': + // move unstarted effects after this effect + this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { + e.startOn += effect.finishOn; + e.finishOn += effect.finishOn; + }); + break; + case 'with-last': + timestamp = this.effects.pluck('startOn').max() || timestamp; + break; + case 'end': + // start effect after last queued effect has finished + timestamp = this.effects.pluck('finishOn').max() || timestamp; + break; + } + + effect.startOn += timestamp; + effect.finishOn += timestamp; + + if(!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) + this.effects.push(effect); + + if(!this.interval) + this.interval = setInterval(this.loop.bind(this), 15); + }, + remove: function(effect) { + this.effects = this.effects.reject(function(e) { return e==effect }); + if(this.effects.length == 0) { + clearInterval(this.interval); + this.interval = null; + } + }, + loop: function() { + var timePos = new Date().getTime(); + for(var i=0, len=this.effects.length;i<len;i++) + if(this.effects[i]) this.effects[i].loop(timePos); + } +}); + +Effect.Queues = { + instances: $H(), + get: function(queueName) { + if(typeof queueName != 'string') return queueName; + + if(!this.instances[queueName]) + this.instances[queueName] = new Effect.ScopedQueue(); + + return this.instances[queueName]; + } +} +Effect.Queue = Effect.Queues.get('global'); + +Effect.DefaultOptions = { + transition: Effect.Transitions.sinoidal, + duration: 1.0, // seconds + fps: 60.0, // max. 60fps due to Effect.Queue implementation + sync: false, // true for combining + from: 0.0, + to: 1.0, + delay: 0.0, + queue: 'parallel' +} + +Effect.Base = function() {}; +Effect.Base.prototype = { + position: null, + start: function(options) { + this.options = Object.extend(Object.extend({},Effect.DefaultOptions), options || {}); + this.currentFrame = 0; + this.state = 'idle'; + this.startOn = this.options.delay*1000; + this.finishOn = this.startOn + (this.options.duration*1000); + this.event('beforeStart'); + if(!this.options.sync) + Effect.Queues.get(typeof this.options.queue == 'string' ? + 'global' : this.options.queue.scope).add(this); + }, + loop: function(timePos) { + if(timePos >= this.startOn) { + if(timePos >= this.finishOn) { + this.render(1.0); + this.cancel(); + this.event('beforeFinish'); + if(this.finish) this.finish(); + this.event('afterFinish'); + return; + } + var pos = (timePos - this.startOn) / (this.finishOn - this.startOn); + var frame = Math.round(pos * this.options.fps * this.options.duration); + if(frame > this.currentFrame) { + this.render(pos); + this.currentFrame = frame; + } + } + }, + render: function(pos) { + if(this.state == 'idle') { + this.state = 'running'; + this.event('beforeSetup'); + if(this.setup) this.setup(); + this.event('afterSetup'); + } + if(this.state == 'running') { + if(this.options.transition) pos = this.options.transition(pos); + pos *= (this.options.to-this.options.from); + pos += this.options.from; + this.position = pos; + this.event('beforeUpdate'); + if(this.update) this.update(pos); + this.event('afterUpdate'); + } + }, + cancel: function() { + if(!this.options.sync) + Effect.Queues.get(typeof this.options.queue == 'string' ? + 'global' : this.options.queue.scope).remove(this); + this.state = 'finished'; + }, + event: function(eventName) { + if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this); + if(this.options[eventName]) this.options[eventName](this); + }, + inspect: function() { + var data = $H(); + for(property in this) + if(typeof this[property] != 'function') data[property] = this[property]; + return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>'; + } +} + +Effect.Parallel = Class.create(); +Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), { + initialize: function(effects) { + this.effects = effects || []; + this.start(arguments[1]); + }, + update: function(position) { + this.effects.invoke('render', position); + }, + finish: function(position) { + this.effects.each( function(effect) { + effect.render(1.0); + effect.cancel(); + effect.event('beforeFinish'); + if(effect.finish) effect.finish(position); + effect.event('afterFinish'); + }); + } +}); + +Effect.Event = Class.create(); +Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), { + initialize: function() { + var options = Object.extend({ + duration: 0 + }, arguments[0] || {}); + this.start(options); + }, + update: Prototype.emptyFunction +}); + +Effect.Opacity = Class.create(); +Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), { + initialize: function(element) { + this.element = $(element); + if(!this.element) throw(Effect._elementDoesNotExistError); + // make this work on IE on elements without 'layout' + if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + var options = Object.extend({ + from: this.element.getOpacity() || 0.0, + to: 1.0 + }, arguments[1] || {}); + this.start(options); + }, + update: function(position) { + this.element.setOpacity(position); + } +}); + +Effect.Move = Class.create(); +Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), { + initialize: function(element) { + this.element = $(element); + if(!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + x: 0, + y: 0, + mode: 'relative' + }, arguments[1] || {}); + this.start(options); + }, + setup: function() { + // Bug in Opera: Opera returns the "real" position of a static element or + // relative element that does not have top/left explicitly set. + // ==> Always set top and left for position relative elements in your stylesheets + // (to 0 if you do not need them) + this.element.makePositioned(); + this.originalLeft = parseFloat(this.element.getStyle('left') || '0'); + this.originalTop = parseFloat(this.element.getStyle('top') || '0'); + if(this.options.mode == 'absolute') { + // absolute movement, so we need to calc deltaX and deltaY + this.options.x = this.options.x - this.originalLeft; + this.options.y = this.options.y - this.originalTop; + } + }, + update: function(position) { + this.element.setStyle({ + left: Math.round(this.options.x * position + this.originalLeft) + 'px', + top: Math.round(this.options.y * position + this.originalTop) + 'px' + }); + } +}); + +// for backwards compatibility +Effect.MoveBy = function(element, toTop, toLeft) { + return new Effect.Move(element, + Object.extend({ x: toLeft, y: toTop }, arguments[3] || {})); +}; + +Effect.Scale = Class.create(); +Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), { + initialize: function(element, percent) { + this.element = $(element); + if(!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + scaleX: true, + scaleY: true, + scaleContent: true, + scaleFromCenter: false, + scaleMode: 'box', // 'box' or 'contents' or {} with provided values + scaleFrom: 100.0, + scaleTo: percent + }, arguments[2] || {}); + this.start(options); + }, + setup: function() { + this.restoreAfterFinish = this.options.restoreAfterFinish || false; + this.elementPositioning = this.element.getStyle('position'); + + this.originalStyle = {}; + ['top','left','width','height','fontSize'].each( function(k) { + this.originalStyle[k] = this.element.style[k]; + }.bind(this)); + + this.originalTop = this.element.offsetTop; + this.originalLeft = this.element.offsetLeft; + + var fontSize = this.element.getStyle('font-size') || '100%'; + ['em','px','%','pt'].each( function(fontSizeType) { + if(fontSize.indexOf(fontSizeType)>0) { + this.fontSize = parseFloat(fontSize); + this.fontSizeType = fontSizeType; + } + }.bind(this)); + + this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; + + this.dims = null; + if(this.options.scaleMode=='box') + this.dims = [this.element.offsetHeight, this.element.offsetWidth]; + if(/^content/.test(this.options.scaleMode)) + this.dims = [this.element.scrollHeight, this.element.scrollWidth]; + if(!this.dims) + this.dims = [this.options.scaleMode.originalHeight, + this.options.scaleMode.originalWidth]; + }, + update: function(position) { + var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position); + if(this.options.scaleContent && this.fontSize) + this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType }); + this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale); + }, + finish: function(position) { + if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle); + }, + setDimensions: function(height, width) { + var d = {}; + if(this.options.scaleX) d.width = Math.round(width) + 'px'; + if(this.options.scaleY) d.height = Math.round(height) + 'px'; + if(this.options.scaleFromCenter) { + var topd = (height - this.dims[0])/2; + var leftd = (width - this.dims[1])/2; + if(this.elementPositioning == 'absolute') { + if(this.options.scaleY) d.top = this.originalTop-topd + 'px'; + if(this.options.scaleX) d.left = this.originalLeft-leftd + 'px'; + } else { + if(this.options.scaleY) d.top = -topd + 'px'; + if(this.options.scaleX) d.left = -leftd + 'px'; + } + } + this.element.setStyle(d); + } +}); + +Effect.Highlight = Class.create(); +Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), { + initialize: function(element) { + this.element = $(element); + if(!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {}); + this.start(options); + }, + setup: function() { + // Prevent executing on elements not in the layout flow + if(this.element.getStyle('display')=='none') { this.cancel(); return; } + // Disable background image during the effect + this.oldStyle = {}; + if (!this.options.keepBackgroundImage) { + this.oldStyle.backgroundImage = this.element.getStyle('background-image'); + this.element.setStyle({backgroundImage: 'none'}); + } + if(!this.options.endcolor) + this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff'); + if(!this.options.restorecolor) + this.options.restorecolor = this.element.getStyle('background-color'); + // init color calculations + this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this)); + this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this)); + }, + update: function(position) { + this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){ + return m+(Math.round(this._base[i]+(this._delta[i]*position)).toColorPart()); }.bind(this)) }); + }, + finish: function() { + this.element.setStyle(Object.extend(this.oldStyle, { + backgroundColor: this.options.restorecolor + })); + } +}); + +Effect.ScrollTo = Class.create(); +Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), { + initialize: function(element) { + this.element = $(element); + this.start(arguments[1] || {}); + }, + setup: function() { + Position.prepare(); + var offsets = Position.cumulativeOffset(this.element); + if(this.options.offset) offsets[1] += this.options.offset; + var max = window.innerHeight ? + window.height - window.innerHeight : + document.body.scrollHeight - + (document.documentElement.clientHeight ? + document.documentElement.clientHeight : document.body.clientHeight); + this.scrollStart = Position.deltaY; + this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart; + }, + update: function(position) { + Position.prepare(); + window.scrollTo(Position.deltaX, + this.scrollStart + (position*this.delta)); + } +}); + +/* ------------- combination effects ------------- */ + +Effect.Fade = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + var options = Object.extend({ + from: element.getOpacity() || 1.0, + to: 0.0, + afterFinishInternal: function(effect) { + if(effect.options.to!=0) return; + effect.element.hide().setStyle({opacity: oldOpacity}); + }}, arguments[1] || {}); + return new Effect.Opacity(element,options); +} + +Effect.Appear = function(element) { + element = $(element); + var options = Object.extend({ + from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), + to: 1.0, + // force Safari to render floated elements properly + afterFinishInternal: function(effect) { + effect.element.forceRerendering(); + }, + beforeSetup: function(effect) { + effect.element.setOpacity(effect.options.from).show(); + }}, arguments[1] || {}); + return new Effect.Opacity(element,options); +} + +Effect.Puff = function(element) { + element = $(element); + var oldStyle = { + opacity: element.getInlineOpacity(), + position: element.getStyle('position'), + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height + }; + return new Effect.Parallel( + [ new Effect.Scale(element, 200, + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], + Object.extend({ duration: 1.0, + beforeSetupInternal: function(effect) { + Position.absolutize(effect.effects[0].element) + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().setStyle(oldStyle); } + }, arguments[1] || {}) + ); +} + +Effect.BlindUp = function(element) { + element = $(element); + element.makeClipping(); + return new Effect.Scale(element, 0, + Object.extend({ scaleContent: false, + scaleX: false, + restoreAfterFinish: true, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }, arguments[1] || {}) + ); +} + +Effect.BlindDown = function(element) { + element = $(element); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: 0, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping(); + } + }, arguments[1] || {})); +} + +Effect.SwitchOff = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + return new Effect.Appear(element, Object.extend({ + duration: 0.4, + from: 0, + transition: Effect.Transitions.flicker, + afterFinishInternal: function(effect) { + new Effect.Scale(effect.element, 1, { + duration: 0.3, scaleFromCenter: true, + scaleX: false, scaleContent: false, restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); + } + }) + } + }, arguments[1] || {})); +} + +Effect.DropOut = function(element) { + element = $(element); + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left'), + opacity: element.getInlineOpacity() }; + return new Effect.Parallel( + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 }) ], + Object.extend( + { duration: 0.5, + beforeSetup: function(effect) { + effect.effects[0].element.makePositioned(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); + } + }, arguments[1] || {})); +} + +Effect.Shake = function(element) { + element = $(element); + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left') }; + return new Effect.Move(element, + { x: 20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { + effect.element.undoPositioned().setStyle(oldStyle); + }}) }}) }}) }}) }}) }}); +} + +Effect.SlideDown = function(element) { + element = $(element).cleanWhitespace(); + // SlideDown need to have the content of the element wrapped in a container element with fixed height! + var oldInnerBottom = element.down().getStyle('bottom'); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: window.opera ? 0 : 1, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if(window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping().undoPositioned(); + effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); } + }, arguments[1] || {}) + ); +} + +Effect.SlideUp = function(element) { + element = $(element).cleanWhitespace(); + var oldInnerBottom = element.down().getStyle('bottom'); + return new Effect.Scale(element, window.opera ? 0 : 1, + Object.extend({ scaleContent: false, + scaleX: false, + scaleMode: 'box', + scaleFrom: 100, + restoreAfterFinish: true, + beforeStartInternal: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if(window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom}); + effect.element.down().undoPositioned(); + } + }, arguments[1] || {}) + ); +} + +// Bug in opera makes the TD containing this element expand for a instance after finish +Effect.Squish = function(element) { + return new Effect.Scale(element, window.opera ? 1 : 0, { + restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }); +} + +Effect.Grow = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.full + }, arguments[1] || {}); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var initialMoveX, initialMoveY; + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + initialMoveX = initialMoveY = moveX = moveY = 0; + break; + case 'top-right': + initialMoveX = dims.width; + initialMoveY = moveY = 0; + moveX = -dims.width; + break; + case 'bottom-left': + initialMoveX = moveX = 0; + initialMoveY = dims.height; + moveY = -dims.height; + break; + case 'bottom-right': + initialMoveX = dims.width; + initialMoveY = dims.height; + moveX = -dims.width; + moveY = -dims.height; + break; + case 'center': + initialMoveX = dims.width / 2; + initialMoveY = dims.height / 2; + moveX = -dims.width / 2; + moveY = -dims.height / 2; + break; + } + + return new Effect.Move(element, { + x: initialMoveX, + y: initialMoveY, + duration: 0.01, + beforeSetup: function(effect) { + effect.element.hide().makeClipping().makePositioned(); + }, + afterFinishInternal: function(effect) { + new Effect.Parallel( + [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), + new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), + new Effect.Scale(effect.element, 100, { + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) + ], Object.extend({ + beforeSetup: function(effect) { + effect.effects[0].element.setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); + } + }, options) + ) + } + }); +} + +Effect.Shrink = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.none + }, arguments[1] || {}); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + moveX = moveY = 0; + break; + case 'top-right': + moveX = dims.width; + moveY = 0; + break; + case 'bottom-left': + moveX = 0; + moveY = dims.height; + break; + case 'bottom-right': + moveX = dims.width; + moveY = dims.height; + break; + case 'center': + moveX = dims.width / 2; + moveY = dims.height / 2; + break; + } + + return new Effect.Parallel( + [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), + new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), + new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) + ], Object.extend({ + beforeStartInternal: function(effect) { + effect.effects[0].element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } + }, options) + ); +} + +Effect.Pulsate = function(element) { + element = $(element); + var options = arguments[1] || {}; + var oldOpacity = element.getInlineOpacity(); + var transition = options.transition || Effect.Transitions.sinoidal; + var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; + reverser.bind(transition); + return new Effect.Opacity(element, + Object.extend(Object.extend({ duration: 2.0, from: 0, + afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } + }, options), {transition: reverser})); +} + +Effect.Fold = function(element) { + element = $(element); + var oldStyle = { + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height }; + element.makeClipping(); + return new Effect.Scale(element, 5, Object.extend({ + scaleContent: false, + scaleX: false, + afterFinishInternal: function(effect) { + new Effect.Scale(element, 1, { + scaleContent: false, + scaleY: false, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().setStyle(oldStyle); + } }); + }}, arguments[1] || {})); +}; + +Effect.Morph = Class.create(); +Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), { + initialize: function(element) { + this.element = $(element); + if(!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + style: {} + }, arguments[1] || {}); + if (typeof options.style == 'string') { + if(options.style.indexOf(':') == -1) { + var cssText = '', selector = '.' + options.style; + $A(document.styleSheets).reverse().each(function(styleSheet) { + if (styleSheet.cssRules) cssRules = styleSheet.cssRules; + else if (styleSheet.rules) cssRules = styleSheet.rules; + $A(cssRules).reverse().each(function(rule) { + if (selector == rule.selectorText) { + cssText = rule.style.cssText; + throw $break; + } + }); + if (cssText) throw $break; + }); + this.style = cssText.parseStyle(); + options.afterFinishInternal = function(effect){ + effect.element.addClassName(effect.options.style); + effect.transforms.each(function(transform) { + if(transform.style != 'opacity') + effect.element.style[transform.style.camelize()] = ''; + }); + } + } else this.style = options.style.parseStyle(); + } else this.style = $H(options.style) + this.start(options); + }, + setup: function(){ + function parseColor(color){ + if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; + color = color.parseColor(); + return $R(0,2).map(function(i){ + return parseInt( color.slice(i*2+1,i*2+3), 16 ) + }); + } + this.transforms = this.style.map(function(pair){ + var property = pair[0].underscore().dasherize(), value = pair[1], unit = null; + + if(value.parseColor('#zzzzzz') != '#zzzzzz') { + value = value.parseColor(); + unit = 'color'; + } else if(property == 'opacity') { + value = parseFloat(value); + if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + } else if(Element.CSS_LENGTH.test(value)) + var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/), + value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null; + + var originalValue = this.element.getStyle(property); + return $H({ + style: property, + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), + targetValue: unit=='color' ? parseColor(value) : value, + unit: unit + }); + }.bind(this)).reject(function(transform){ + return ( + (transform.originalValue == transform.targetValue) || + ( + transform.unit != 'color' && + (isNaN(transform.originalValue) || isNaN(transform.targetValue)) + ) + ) + }); + }, + update: function(position) { + var style = $H(), value = null; + this.transforms.each(function(transform){ + value = transform.unit=='color' ? + $R(0,2).inject('#',function(m,v,i){ + return m+(Math.round(transform.originalValue[i]+ + (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) : + transform.originalValue + Math.round( + ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit; + style[transform.style] = value; + }); + this.element.setStyle(style); + } +}); + +Effect.Transform = Class.create(); +Object.extend(Effect.Transform.prototype, { + initialize: function(tracks){ + this.tracks = []; + this.options = arguments[1] || {}; + this.addTracks(tracks); + }, + addTracks: function(tracks){ + tracks.each(function(track){ + var data = $H(track).values().first(); + this.tracks.push($H({ + ids: $H(track).keys().first(), + effect: Effect.Morph, + options: { style: data } + })); + }.bind(this)); + return this; + }, + play: function(){ + return new Effect.Parallel( + this.tracks.map(function(track){ + var elements = [$(track.ids) || $$(track.ids)].flatten(); + return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) }); + }).flatten(), + this.options + ); + } +}); + +Element.CSS_PROPERTIES = $w( + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + + 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + + 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + + 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + + 'fontSize fontWeight height left letterSpacing lineHeight ' + + 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+ + 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + + 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + + 'right textIndent top width wordSpacing zIndex'); + +Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; + +String.prototype.parseStyle = function(){ + var element = Element.extend(document.createElement('div')); + element.innerHTML = '<div style="' + this + '"></div>'; + var style = element.down().style, styleRules = $H(); + + Element.CSS_PROPERTIES.each(function(property){ + if(style[property]) styleRules[property] = style[property]; + }); + if(/MSIE/.test(navigator.userAgent) && !window.opera && this.indexOf('opacity') > -1) { + styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]; + } + return styleRules; +}; + +Element.morph = function(element, style) { + new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {})); + return element; +}; + +['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom', + 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each( + function(f) { Element.Methods[f] = Element[f]; } +); + +Element.Methods.visualEffect = function(element, effect, options) { + s = effect.gsub(/_/, '-').camelize(); + effect_class = s.charAt(0).toUpperCase() + s.substring(1); + new Effect[effect_class](element, options); + return $(element); +}; + +Element.addMethods(); \ No newline at end of file Copied: trunk/theme/src/bin/portal-ajax-war/dyna/prototype.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/prototype.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/prototype.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/prototype.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,2515 @@ +/* Prototype JavaScript framework, version 1.5.0 + * (c) 2005-2007 Sam Stephenson + * + * Prototype is freely distributable under the terms of an MIT-style license. + * For details, see the Prototype web site: http://prototype.conio.net/ + * +/*--------------------------------------------------------------------------*/ + +var Prototype = { + Version: '1.5.0', + BrowserFeatures: { + XPath: !!document.evaluate + }, + + ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)', + emptyFunction: function() {}, + K: function(x) { return x } +} + +var Class = { + create: function() { + return function() { + this.initialize.apply(this, arguments); + } + } +} + +var Abstract = new Object(); + +Object.extend = function(destination, source) { + for (var property in source) { + destination[property] = source[property]; + } + return destination; +} + +Object.extend(Object, { + inspect: function(object) { + try { + if (object === undefined) return 'undefined'; + if (object === null) return 'null'; + return object.inspect ? object.inspect() : object.toString(); + } catch (e) { + if (e instanceof RangeError) return '...'; + throw e; + } + }, + + keys: function(object) { + var keys = []; + for (var property in object) + keys.push(property); + return keys; + }, + + values: function(object) { + var values = []; + for (var property in object) + values.push(object[property]); + return values; + }, + + clone: function(object) { + return Object.extend({}, object); + } +}); + +Function.prototype.bind = function() { + var __method = this, args = $A(arguments), object = args.shift(); + return function() { + return __method.apply(object, args.concat($A(arguments))); + } +} + +Function.prototype.bindAsEventListener = function(object) { + var __method = this, args = $A(arguments), object = args.shift(); + return function(event) { + return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments))); + } +} + +Object.extend(Number.prototype, { + toColorPart: function() { + var digits = this.toString(16); + if (this < 16) return '0' + digits; + return digits; + }, + + succ: function() { + return this + 1; + }, + + times: function(iterator) { + $R(0, this, true).each(iterator); + return this; + } +}); + +var Try = { + these: function() { + var returnValue; + + for (var i = 0, length = arguments.length; i < length; i++) { + var lambda = arguments[i]; + try { + returnValue = lambda(); + break; + } catch (e) {} + } + + return returnValue; + } +} + +/*--------------------------------------------------------------------------*/ + +var PeriodicalExecuter = Class.create(); +PeriodicalExecuter.prototype = { + initialize: function(callback, frequency) { + this.callback = callback; + this.frequency = frequency; + this.currentlyExecuting = false; + + this.registerCallback(); + }, + + registerCallback: function() { + this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); + }, + + stop: function() { + if (!this.timer) return; + clearInterval(this.timer); + this.timer = null; + }, + + onTimerEvent: function() { + if (!this.currentlyExecuting) { + try { + this.currentlyExecuting = true; + this.callback(this); + } finally { + this.currentlyExecuting = false; + } + } + } +} +String.interpret = function(value){ + return value == null ? '' : String(value); +} + +Object.extend(String.prototype, { + gsub: function(pattern, replacement) { + var result = '', source = this, match; + replacement = arguments.callee.prepareReplacement(replacement); + + while (source.length > 0) { + if (match = source.match(pattern)) { + result += source.slice(0, match.index); + result += String.interpret(replacement(match)); + source = source.slice(match.index + match[0].length); + } else { + result += source, source = ''; + } + } + return result; + }, + + sub: function(pattern, replacement, count) { + replacement = this.gsub.prepareReplacement(replacement); + count = count === undefined ? 1 : count; + + return this.gsub(pattern, function(match) { + if (--count < 0) return match[0]; + return replacement(match); + }); + }, + + scan: function(pattern, iterator) { + this.gsub(pattern, iterator); + return this; + }, + + truncate: function(length, truncation) { + length = length || 30; + truncation = truncation === undefined ? '...' : truncation; + return this.length > length ? + this.slice(0, length - truncation.length) + truncation : this; + }, + + strip: function() { + return this.replace(/^\s+/, '').replace(/\s+$/, ''); + }, + + stripTags: function() { + return this.replace(/<\/?[^>]+>/gi, ''); + }, + + stripScripts: function() { + return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); + }, + + extractScripts: function() { + var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); + var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); + return (this.match(matchAll) || []).map(function(scriptTag) { + return (scriptTag.match(matchOne) || ['', ''])[1]; + }); + }, + + evalScripts: function() { + return this.extractScripts().map(function(script) { return eval(script) }); + }, + + escapeHTML: function() { + var div = document.createElement('div'); + var text = document.createTextNode(this); + div.appendChild(text); + return div.innerHTML; + }, + + unescapeHTML: function() { + var div = document.createElement('div'); + div.innerHTML = this.stripTags(); + return div.childNodes[0] ? (div.childNodes.length > 1 ? + $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) : + div.childNodes[0].nodeValue) : ''; + }, + + toQueryParams: function(separator) { + var match = this.strip().match(/([^?#]*)(#.*)?$/); + if (!match) return {}; + + return match[1].split(separator || '&').inject({}, function(hash, pair) { + if ((pair = pair.split('='))[0]) { + var name = decodeURIComponent(pair[0]); + var value = pair[1] ? decodeURIComponent(pair[1]) : undefined; + + if (hash[name] !== undefined) { + if (hash[name].constructor != Array) + hash[name] = [hash[name]]; + if (value) hash[name].push(value); + } + else hash[name] = value; + } + return hash; + }); + }, + + toArray: function() { + return this.split(''); + }, + + succ: function() { + return this.slice(0, this.length - 1) + + String.fromCharCode(this.charCodeAt(this.length - 1) + 1); + }, + + camelize: function() { + var parts = this.split('-'), len = parts.length; + if (len == 1) return parts[0]; + + var camelized = this.charAt(0) == '-' + ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1) + : parts[0]; + + for (var i = 1; i < len; i++) + camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1); + + return camelized; + }, + + capitalize: function(){ + return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase(); + }, + + underscore: function() { + return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase(); + }, + + dasherize: function() { + return this.gsub(/_/,'-'); + }, + + inspect: function(useDoubleQuotes) { + var escapedString = this.replace(/\\/g, '\\\\'); + if (useDoubleQuotes) + return '"' + escapedString.replace(/"/g, '\\"') + '"'; + else + return "'" + escapedString.replace(/'/g, '\\\'') + "'"; + } +}); + +String.prototype.gsub.prepareReplacement = function(replacement) { + if (typeof replacement == 'function') return replacement; + var template = new Template(replacement); + return function(match) { return template.evaluate(match) }; +} + +String.prototype.parseQuery = String.prototype.toQueryParams; + +var Template = Class.create(); +Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; +Template.prototype = { + initialize: function(template, pattern) { + this.template = template.toString(); + this.pattern = pattern || Template.Pattern; + }, + + evaluate: function(object) { + return this.template.gsub(this.pattern, function(match) { + var before = match[1]; + if (before == '\\') return match[2]; + return before + String.interpret(object[match[3]]); + }); + } +} + +var $break = new Object(); +var $continue = new Object(); + +var Enumerable = { + each: function(iterator) { + var index = 0; + try { + this._each(function(value) { + try { + iterator(value, index++); + } catch (e) { + if (e != $continue) throw e; + } + }); + } catch (e) { + if (e != $break) throw e; + } + return this; + }, + + eachSlice: function(number, iterator) { + var index = -number, slices = [], array = this.toArray(); + while ((index += number) < array.length) + slices.push(array.slice(index, index+number)); + return slices.map(iterator); + }, + + all: function(iterator) { + var result = true; + this.each(function(value, index) { + result = result && !!(iterator || Prototype.K)(value, index); + if (!result) throw $break; + }); + return result; + }, + + any: function(iterator) { + var result = false; + this.each(function(value, index) { + if (result = !!(iterator || Prototype.K)(value, index)) + throw $break; + }); + return result; + }, + + collect: function(iterator) { + var results = []; + this.each(function(value, index) { + results.push((iterator || Prototype.K)(value, index)); + }); + return results; + }, + + detect: function(iterator) { + var result; + this.each(function(value, index) { + if (iterator(value, index)) { + result = value; + throw $break; + } + }); + return result; + }, + + findAll: function(iterator) { + var results = []; + this.each(function(value, index) { + if (iterator(value, index)) + results.push(value); + }); + return results; + }, + + grep: function(pattern, iterator) { + var results = []; + this.each(function(value, index) { + var stringValue = value.toString(); + if (stringValue.match(pattern)) + results.push((iterator || Prototype.K)(value, index)); + }) + return results; + }, + + include: function(object) { + var found = false; + this.each(function(value) { + if (value == object) { + found = true; + throw $break; + } + }); + return found; + }, + + inGroupsOf: function(number, fillWith) { + fillWith = fillWith === undefined ? null : fillWith; + return this.eachSlice(number, function(slice) { + while(slice.length < number) slice.push(fillWith); + return slice; + }); + }, + + inject: function(memo, iterator) { + this.each(function(value, index) { + memo = iterator(memo, value, index); + }); + return memo; + }, + + invoke: function(method) { + var args = $A(arguments).slice(1); + return this.map(function(value) { + return value[method].apply(value, args); + }); + }, + + max: function(iterator) { + var result; + this.each(function(value, index) { + value = (iterator || Prototype.K)(value, index); + if (result == undefined || value >= result) + result = value; + }); + return result; + }, + + min: function(iterator) { + var result; + this.each(function(value, index) { + value = (iterator || Prototype.K)(value, index); + if (result == undefined || value < result) + result = value; + }); + return result; + }, + + partition: function(iterator) { + var trues = [], falses = []; + this.each(function(value, index) { + ((iterator || Prototype.K)(value, index) ? + trues : falses).push(value); + }); + return [trues, falses]; + }, + + pluck: function(property) { + var results = []; + this.each(function(value, index) { + results.push(value[property]); + }); + return results; + }, + + reject: function(iterator) { + var results = []; + this.each(function(value, index) { + if (!iterator(value, index)) + results.push(value); + }); + return results; + }, + + sortBy: function(iterator) { + return this.map(function(value, index) { + return {value: value, criteria: iterator(value, index)}; + }).sort(function(left, right) { + var a = left.criteria, b = right.criteria; + return a < b ? -1 : a > b ? 1 : 0; + }).pluck('value'); + }, + + toArray: function() { + return this.map(); + }, + + zip: function() { + var iterator = Prototype.K, args = $A(arguments); + if (typeof args.last() == 'function') + iterator = args.pop(); + + var collections = [this].concat(args).map($A); + return this.map(function(value, index) { + return iterator(collections.pluck(index)); + }); + }, + + size: function() { + return this.toArray().length; + }, + + inspect: function() { + return '#<Enumerable:' + this.toArray().inspect() + '>'; + } +} + +Object.extend(Enumerable, { + map: Enumerable.collect, + find: Enumerable.detect, + select: Enumerable.findAll, + member: Enumerable.include, + entries: Enumerable.toArray +}); +var $A = Array.from = function(iterable) { + if (!iterable) return []; + if (iterable.toArray) { + return iterable.toArray(); + } else { + var results = []; + for (var i = 0, length = iterable.length; i < length; i++) + results.push(iterable[i]); + return results; + } +} + +Object.extend(Array.prototype, Enumerable); + +if (!Array.prototype._reverse) + Array.prototype._reverse = Array.prototype.reverse; + +Object.extend(Array.prototype, { + _each: function(iterator) { + for (var i = 0, length = this.length; i < length; i++) + iterator(this[i]); + }, + + clear: function() { + this.length = 0; + return this; + }, + + first: function() { + return this[0]; + }, + + last: function() { + return this[this.length - 1]; + }, + + compact: function() { + return this.select(function(value) { + return value != null; + }); + }, + + flatten: function() { + return this.inject([], function(array, value) { + return array.concat(value && value.constructor == Array ? + value.flatten() : [value]); + }); + }, + + without: function() { + var values = $A(arguments); + return this.select(function(value) { + return !values.include(value); + }); + }, + + indexOf: function(object) { + for (var i = 0, length = this.length; i < length; i++) + if (this[i] == object) return i; + return -1; + }, + + reverse: function(inline) { + return (inline !== false ? this : this.toArray())._reverse(); + }, + + reduce: function() { + return this.length > 1 ? this : this[0]; + }, + + uniq: function() { + return this.inject([], function(array, value) { + return array.include(value) ? array : array.concat([value]); + }); + }, + + clone: function() { + return [].concat(this); + }, + + size: function() { + return this.length; + }, + + inspect: function() { + return '[' + this.map(Object.inspect).join(', ') + ']'; + } +}); + +Array.prototype.toArray = Array.prototype.clone; + +function $w(string){ + string = string.strip(); + return string ? string.split(/\s+/) : []; +} + +if(window.opera){ + Array.prototype.concat = function(){ + var array = []; + for(var i = 0, length = this.length; i < length; i++) array.push(this[i]); + for(var i = 0, length = arguments.length; i < length; i++) { + if(arguments[i].constructor == Array) { + for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++) + array.push(arguments[i][j]); + } else { + array.push(arguments[i]); + } + } + return array; + } +} +var Hash = function(obj) { + Object.extend(this, obj || {}); +}; + +Object.extend(Hash, { + toQueryString: function(obj) { + var parts = []; + + this.prototype._each.call(obj, function(pair) { + if (!pair.key) return; + + if (pair.value && pair.value.constructor == Array) { + var values = pair.value.compact(); + if (values.length < 2) pair.value = values.reduce(); + else { + key = encodeURIComponent(pair.key); + values.each(function(value) { + value = value != undefined ? encodeURIComponent(value) : ''; + parts.push(key + '=' + encodeURIComponent(value)); + }); + return; + } + } + if (pair.value == undefined) pair[1] = ''; + parts.push(pair.map(encodeURIComponent).join('=')); + }); + + return parts.join('&'); + } +}); + +Object.extend(Hash.prototype, Enumerable); +Object.extend(Hash.prototype, { + _each: function(iterator) { + for (var key in this) { + var value = this[key]; + if (value && value == Hash.prototype[key]) continue; + + var pair = [key, value]; + pair.key = key; + pair.value = value; + iterator(pair); + } + }, + + keys: function() { + return this.pluck('key'); + }, + + values: function() { + return this.pluck('value'); + }, + + merge: function(hash) { + return $H(hash).inject(this, function(mergedHash, pair) { + mergedHash[pair.key] = pair.value; + return mergedHash; + }); + }, + + remove: function() { + var result; + for(var i = 0, length = arguments.length; i < length; i++) { + var value = this[arguments[i]]; + if (value !== undefined){ + if (result === undefined) result = value; + else { + if (result.constructor != Array) result = [result]; + result.push(value) + } + } + delete this[arguments[i]]; + } + return result; + }, + + toQueryString: function() { + return Hash.toQueryString(this); + }, + + inspect: function() { + return '#<Hash:{' + this.map(function(pair) { + return pair.map(Object.inspect).join(': '); + }).join(', ') + '}>'; + } +}); + +function $H(object) { + if (object && object.constructor == Hash) return object; + return new Hash(object); +}; +ObjectRange = Class.create(); +Object.extend(ObjectRange.prototype, Enumerable); +Object.extend(ObjectRange.prototype, { + initialize: function(start, end, exclusive) { + this.start = start; + this.end = end; + this.exclusive = exclusive; + }, + + _each: function(iterator) { + var value = this.start; + while (this.include(value)) { + iterator(value); + value = value.succ(); + } + }, + + include: function(value) { + if (value < this.start) + return false; + if (this.exclusive) + return value < this.end; + return value <= this.end; + } +}); + +var $R = function(start, end, exclusive) { + return new ObjectRange(start, end, exclusive); +} + +var Ajax = { + getTransport: function() { + return Try.these( + function() {return new XMLHttpRequest()}, + function() {return new ActiveXObject('Msxml2.XMLHTTP')}, + function() {return new ActiveXObject('Microsoft.XMLHTTP')} + ) || false; + }, + + activeRequestCount: 0 +} + +Ajax.Responders = { + responders: [], + + _each: function(iterator) { + this.responders._each(iterator); + }, + + register: function(responder) { + if (!this.include(responder)) + this.responders.push(responder); + }, + + unregister: function(responder) { + this.responders = this.responders.without(responder); + }, + + dispatch: function(callback, request, transport, json) { + this.each(function(responder) { + if (typeof responder[callback] == 'function') { + try { + responder[callback].apply(responder, [request, transport, json]); + } catch (e) {} + } + }); + } +}; + +Object.extend(Ajax.Responders, Enumerable); + +Ajax.Responders.register({ + onCreate: function() { + Ajax.activeRequestCount++; + }, + onComplete: function() { + Ajax.activeRequestCount--; + } +}); + +Ajax.Base = function() {}; +Ajax.Base.prototype = { + setOptions: function(options) { + this.options = { + method: 'post', + asynchronous: true, + contentType: 'application/x-www-form-urlencoded', + encoding: 'UTF-8', + parameters: '' + } + Object.extend(this.options, options || {}); + + this.options.method = this.options.method.toLowerCase(); + if (typeof this.options.parameters == 'string') + this.options.parameters = this.options.parameters.toQueryParams(); + } +} + +Ajax.Request = Class.create(); +Ajax.Request.Events = + ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; + +Ajax.Request.prototype = Object.extend(new Ajax.Base(), { + _complete: false, + + initialize: function(url, options) { + this.transport = Ajax.getTransport(); + this.setOptions(options); + this.request(url); + }, + + request: function(url) { + this.url = url; + this.method = this.options.method; + var params = this.options.parameters; + + if (!['get', 'post'].include(this.method)) { + // simulate other verbs over post + params['_method'] = this.method; + this.method = 'post'; + } + + params = Hash.toQueryString(params); + if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_=' + + // when GET, append parameters to URL + if (this.method == 'get' && params) + this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params; + + try { + Ajax.Responders.dispatch('onCreate', this, this.transport); + + this.transport.open(this.method.toUpperCase(), this.url, + this.options.asynchronous); + + if (this.options.asynchronous) + setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10); + + this.transport.onreadystatechange = this.onStateChange.bind(this); + this.setRequestHeaders(); + + var body = this.method == 'post' ? (this.options.postBody || params) : null; + + this.transport.send(body); + + /* Force Firefox to handle ready state 4 for synchronous requests */ + if (!this.options.asynchronous && this.transport.overrideMimeType) + this.onStateChange(); + + } + catch (e) { + this.dispatchException(e); + } + }, + + onStateChange: function() { + var readyState = this.transport.readyState; + if (readyState > 1 && !((readyState == 4) && this._complete)) + this.respondToReadyState(this.transport.readyState); + }, + + setRequestHeaders: function() { + var headers = { + 'X-Requested-With': 'XMLHttpRequest', + 'X-Prototype-Version': Prototype.Version, + 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*' + }; + + if (this.method == 'post') { + headers['Content-type'] = this.options.contentType + + (this.options.encoding ? '; charset=' + this.options.encoding : ''); + + /* Force "Connection: close" for older Mozilla browsers to work + * around a bug where XMLHttpRequest sends an incorrect + * Content-length header. See Mozilla Bugzilla #246651. + */ + if (this.transport.overrideMimeType && + (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) + headers['Connection'] = 'close'; + } + + // user-defined headers + if (typeof this.options.requestHeaders == 'object') { + var extras = this.options.requestHeaders; + + if (typeof extras.push == 'function') + for (var i = 0, length = extras.length; i < length; i += 2) + headers[extras[i]] = extras[i+1]; + else + $H(extras).each(function(pair) { headers[pair.key] = pair.value }); + } + + for (var name in headers) + this.transport.setRequestHeader(name, headers[name]); + }, + + success: function() { + return !this.transport.status + || (this.transport.status >= 200 && this.transport.status < 300); + }, + + respondToReadyState: function(readyState) { + var state = Ajax.Request.Events[readyState]; + var transport = this.transport, json = this.evalJSON(); + + if (state == 'Complete') { + try { + this._complete = true; + (this.options['on' + this.transport.status] + || this.options['on' + (this.success() ? 'Success' : 'Failure')] + || Prototype.emptyFunction)(transport, json); + } catch (e) { + this.dispatchException(e); + } + + if ((this.getHeader('Content-type') || 'text/javascript').strip(). + match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i)) + this.evalResponse(); + } + + try { + (this.options['on' + state] || Prototype.emptyFunction)(transport, json); + Ajax.Responders.dispatch('on' + state, this, transport, json); + } catch (e) { + this.dispatchException(e); + } + + if (state == 'Complete') { + // avoid memory leak in MSIE: clean up + this.transport.onreadystatechange = Prototype.emptyFunction; + } + }, + + getHeader: function(name) { + try { + return this.transport.getResponseHeader(name); + } catch (e) { return null } + }, + + evalJSON: function() { + try { + var json = this.getHeader('X-JSON'); + return json ? eval('(' + json + ')') : null; + } catch (e) { return null } + }, + + evalResponse: function() { + try { + return eval(this.transport.responseText); + } catch (e) { + this.dispatchException(e); + } + }, + + dispatchException: function(exception) { + (this.options.onException || Prototype.emptyFunction)(this, exception); + Ajax.Responders.dispatch('onException', this, exception); + } +}); + +Ajax.Updater = Class.create(); + +Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { + initialize: function(container, url, options) { + this.container = { + success: (container.success || container), + failure: (container.failure || (container.success ? null : container)) + } + + this.transport = Ajax.getTransport(); + this.setOptions(options); + + var onComplete = this.options.onComplete || Prototype.emptyFunction; + this.options.onComplete = (function(transport, param) { + this.updateContent(); + onComplete(transport, param); + }).bind(this); + + this.request(url); + }, + + updateContent: function() { + var receiver = this.container[this.success() ? 'success' : 'failure']; + var response = this.transport.responseText; + + if (!this.options.evalScripts) response = response.stripScripts(); + + if (receiver = $(receiver)) { + if (this.options.insertion) + new this.options.insertion(receiver, response); + else + receiver.update(response); + } + + if (this.success()) { + if (this.onComplete) + setTimeout(this.onComplete.bind(this), 10); + } + } +}); + +Ajax.PeriodicalUpdater = Class.create(); +Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), { + initialize: function(container, url, options) { + this.setOptions(options); + this.onComplete = this.options.onComplete; + + this.frequency = (this.options.frequency || 2); + this.decay = (this.options.decay || 1); + + this.updater = {}; + this.container = container; + this.url = url; + + this.start(); + }, + + start: function() { + this.options.onComplete = this.updateComplete.bind(this); + this.onTimerEvent(); + }, + + stop: function() { + this.updater.options.onComplete = undefined; + clearTimeout(this.timer); + (this.onComplete || Prototype.emptyFunction).apply(this, arguments); + }, + + updateComplete: function(request) { + if (this.options.decay) { + this.decay = (request.responseText == this.lastText ? + this.decay * this.options.decay : 1); + + this.lastText = request.responseText; + } + this.timer = setTimeout(this.onTimerEvent.bind(this), + this.decay * this.frequency * 1000); + }, + + onTimerEvent: function() { + this.updater = new Ajax.Updater(this.container, this.url, this.options); + } +}); +function $(element) { + if (arguments.length > 1) { + for (var i = 0, elements = [], length = arguments.length; i < length; i++) + elements.push($(arguments[i])); + return elements; + } + if (typeof element == 'string') + element = document.getElementById(element); + return Element.extend(element); +} + +if (Prototype.BrowserFeatures.XPath) { + document._getElementsByXPath = function(expression, parentElement) { + var results = []; + var query = document.evaluate(expression, $(parentElement) || document, + null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); + for (var i = 0, length = query.snapshotLength; i < length; i++) + results.push(query.snapshotItem(i)); + return results; + }; +} + +document.getElementsByClassName = function(className, parentElement) { + if (Prototype.BrowserFeatures.XPath) { + var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]"; + return document._getElementsByXPath(q, parentElement); + } else { + var children = ($(parentElement) || document.body).getElementsByTagName('*'); + var elements = [], child; + for (var i = 0, length = children.length; i < length; i++) { + child = children[i]; + if (Element.hasClassName(child, className)) + elements.push(Element.extend(child)); + } + return elements; + } +}; + +/*--------------------------------------------------------------------------*/ + +if (!window.Element) + var Element = new Object(); + +Element.extend = function(element) { + if (!element || _nativeExtensions || element.nodeType == 3) return element; + + if (!element._extended && element.tagName && element != window) { + var methods = Object.clone(Element.Methods), cache = Element.extend.cache; + + if (element.tagName == 'FORM') + Object.extend(methods, Form.Methods); + if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName)) + Object.extend(methods, Form.Element.Methods); + + Object.extend(methods, Element.Methods.Simulated); + + for (var property in methods) { + var value = methods[property]; + if (typeof value == 'function' && !(property in element)) + element[property] = cache.findOrStore(value); + } + } + + element._extended = true; + return element; +}; + +Element.extend.cache = { + findOrStore: function(value) { + return this[value] = this[value] || function() { + return value.apply(null, [this].concat($A(arguments))); + } + } +}; + +Element.Methods = { + visible: function(element) { + return $(element).style.display != 'none'; + }, + + toggle: function(element) { + element = $(element); + Element[Element.visible(element) ? 'hide' : 'show'](element); + return element; + }, + + hide: function(element) { + $(element).style.display = 'none'; + return element; + }, + + show: function(element) { + $(element).style.display = ''; + return element; + }, + + remove: function(element) { + element = $(element); + element.parentNode.removeChild(element); + return element; + }, + + update: function(element, html) { + html = typeof html == 'undefined' ? '' : html.toString(); + $(element).innerHTML = html.stripScripts(); + setTimeout(function() {html.evalScripts()}, 10); + return element; + }, + + replace: function(element, html) { + element = $(element); + html = typeof html == 'undefined' ? '' : html.toString(); + if (element.outerHTML) { + element.outerHTML = html.stripScripts(); + } else { + var range = element.ownerDocument.createRange(); + range.selectNodeContents(element); + element.parentNode.replaceChild( + range.createContextualFragment(html.stripScripts()), element); + } + setTimeout(function() {html.evalScripts()}, 10); + return element; + }, + + inspect: function(element) { + element = $(element); + var result = '<' + element.tagName.toLowerCase(); + $H({'id': 'id', 'className': 'class'}).each(function(pair) { + var property = pair.first(), attribute = pair.last(); + var value = (element[property] || '').toString(); + if (value) result += ' ' + attribute + '=' + value.inspect(true); + }); + return result + '>'; + }, + + recursivelyCollect: function(element, property) { + element = $(element); + var elements = []; + while (element = element[property]) + if (element.nodeType == 1) + elements.push(Element.extend(element)); + return elements; + }, + + ancestors: function(element) { + return $(element).recursivelyCollect('parentNode'); + }, + + descendants: function(element) { + return $A($(element).getElementsByTagName('*')); + }, + + immediateDescendants: function(element) { + if (!(element = $(element).firstChild)) return []; + while (element && element.nodeType != 1) element = element.nextSibling; + if (element) return [element].concat($(element).nextSiblings()); + return []; + }, + + previousSiblings: function(element) { + return $(element).recursivelyCollect('previousSibling'); + }, + + nextSiblings: function(element) { + return $(element).recursivelyCollect('nextSibling'); + }, + + siblings: function(element) { + element = $(element); + return element.previousSiblings().reverse().concat(element.nextSiblings()); + }, + + match: function(element, selector) { + if (typeof selector == 'string') + selector = new Selector(selector); + return selector.match($(element)); + }, + + up: function(element, expression, index) { + return Selector.findElement($(element).ancestors(), expression, index); + }, + + down: function(element, expression, index) { + return Selector.findElement($(element).descendants(), expression, index); + }, + + previous: function(element, expression, index) { + return Selector.findElement($(element).previousSiblings(), expression, index); + }, + + next: function(element, expression, index) { + return Selector.findElement($(element).nextSiblings(), expression, index); + }, + + getElementsBySelector: function() { + var args = $A(arguments), element = $(args.shift()); + return Selector.findChildElements(element, args); + }, + + getElementsByClassName: function(element, className) { + return document.getElementsByClassName(className, element); + }, + + readAttribute: function(element, name) { + element = $(element); + if (document.all && !window.opera) { + var t = Element._attributeTranslations; + if (t.values[name]) return t.values[name](element, name); + if (t.names[name]) name = t.names[name]; + var attribute = element.attributes[name]; + if(attribute) return attribute.nodeValue; + } + return element.getAttribute(name); + }, + + getHeight: function(element) { + return $(element).getDimensions().height; + }, + + getWidth: function(element) { + return $(element).getDimensions().width; + }, + + classNames: function(element) { + return new Element.ClassNames(element); + }, + + hasClassName: function(element, className) { + if (!(element = $(element))) return; + var elementClassName = element.className; + if (elementClassName.length == 0) return false; + if (elementClassName == className || + elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) + return true; + return false; + }, + + addClassName: function(element, className) { + if (!(element = $(element))) return; + Element.classNames(element).add(className); + return element; + }, + + removeClassName: function(element, className) { + if (!(element = $(element))) return; + Element.classNames(element).remove(className); + return element; + }, + + toggleClassName: function(element, className) { + if (!(element = $(element))) return; + Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className); + return element; + }, + + observe: function() { + Event.observe.apply(Event, arguments); + return $A(arguments).first(); + }, + + stopObserving: function() { + Event.stopObserving.apply(Event, arguments); + return $A(arguments).first(); + }, + + // removes whitespace-only text node children + cleanWhitespace: function(element) { + element = $(element); + var node = element.firstChild; + while (node) { + var nextNode = node.nextSibling; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + element.removeChild(node); + node = nextNode; + } + return element; + }, + + empty: function(element) { + return $(element).innerHTML.match(/^\s*$/); + }, + + descendantOf: function(element, ancestor) { + element = $(element), ancestor = $(ancestor); + while (element = element.parentNode) + if (element == ancestor) return true; + return false; + }, + + scrollTo: function(element) { + element = $(element); + var pos = Position.cumulativeOffset(element); + window.scrollTo(pos[0], pos[1]); + return element; + }, + + getStyle: function(element, style) { + element = $(element); + if (['float','cssFloat'].include(style)) + style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat'); + style = style.camelize(); + var value = element.style[style]; + if (!value) { + if (document.defaultView && document.defaultView.getComputedStyle) { + var css = document.defaultView.getComputedStyle(element, null); + value = css ? css[style] : null; + } else if (element.currentStyle) { + value = element.currentStyle[style]; + } + } + + if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none')) + value = element['offset'+style.capitalize()] + 'px'; + + if (window.opera && ['left', 'top', 'right', 'bottom'].include(style)) + if (Element.getStyle(element, 'position') == 'static') value = 'auto'; + if(style == 'opacity') { + if(value) return parseFloat(value); + if(value = (element.getStyle('filter') || '').match(/alpha$opacity=(.*)$/)) + if(value[1]) return parseFloat(value[1]) / 100; + return 1.0; + } + return value == 'auto' ? null : value; + }, + + setStyle: function(element, style) { + element = $(element); + for (var name in style) { + var value = style[name]; + if(name == 'opacity') { + if (value == 1) { + value = (/Gecko/.test(navigator.userAgent) && + !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0; + if(/MSIE/.test(navigator.userAgent) && !window.opera) + element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,''); + } else if(value === '') { + if(/MSIE/.test(navigator.userAgent) && !window.opera) + element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,''); + } else { + if(value < 0.00001) value = 0; + if(/MSIE/.test(navigator.userAgent) && !window.opera) + element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,'') + + 'alpha(opacity='+value*100+')'; + } + } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat'; + element.style[name.camelize()] = value; + } + return element; + }, + + getDimensions: function(element) { + element = $(element); + var display = $(element).getStyle('display'); + if (display != 'none' && display != null) // Safari bug + return {width: element.offsetWidth, height: element.offsetHeight}; + + // All *Width and *Height properties give 0 on elements with display none, + // so enable the element temporarily + var els = element.style; + var originalVisibility = els.visibility; + var originalPosition = els.position; + var originalDisplay = els.display; + els.visibility = 'hidden'; + els.position = 'absolute'; + els.display = 'block'; + var originalWidth = element.clientWidth; + var originalHeight = element.clientHeight; + els.display = originalDisplay; + els.position = originalPosition; + els.visibility = originalVisibility; + return {width: originalWidth, height: originalHeight}; + }, + + makePositioned: function(element) { + element = $(element); + var pos = Element.getStyle(element, 'position'); + if (pos == 'static' || !pos) { + element._madePositioned = true; + element.style.position = 'relative'; + // Opera returns the offset relative to the positioning context, when an + // element is position relative but top and left have not been defined + if (window.opera) { + element.style.top = 0; + element.style.left = 0; + } + } + return element; + }, + + undoPositioned: function(element) { + element = $(element); + if (element._madePositioned) { + element._madePositioned = undefined; + element.style.position = + element.style.top = + element.style.left = + element.style.bottom = + element.style.right = ''; + } + return element; + }, + + makeClipping: function(element) { + element = $(element); + if (element._overflow) return element; + element._overflow = element.style.overflow || 'auto'; + if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') + element.style.overflow = 'hidden'; + return element; + }, + + undoClipping: function(element) { + element = $(element); + if (!element._overflow) return element; + element.style.overflow = element._overflow == 'auto' ? '' : element._overflow; + element._overflow = null; + return element; + } +}; + +Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf}); + +Element._attributeTranslations = {}; + +Element._attributeTranslations.names = { + colspan: "colSpan", + rowspan: "rowSpan", + valign: "vAlign", + datetime: "dateTime", + accesskey: "accessKey", + tabindex: "tabIndex", + enctype: "encType", + maxlength: "maxLength", + readonly: "readOnly", + longdesc: "longDesc" +}; + +Element._attributeTranslations.values = { + _getAttr: function(element, attribute) { + return element.getAttribute(attribute, 2); + }, + + _flag: function(element, attribute) { + return $(element).hasAttribute(attribute) ? attribute : null; + }, + + style: function(element) { + return element.style.cssText.toLowerCase(); + }, + + title: function(element) { + var node = element.getAttributeNode('title'); + return node.specified ? node.nodeValue : null; + } +}; + +Object.extend(Element._attributeTranslations.values, { + href: Element._attributeTranslations.values._getAttr, + src: Element._attributeTranslations.values._getAttr, + disabled: Element._attributeTranslations.values._flag, + checked: Element._attributeTranslations.values._flag, + readonly: Element._attributeTranslations.values._flag, + multiple: Element._attributeTranslations.values._flag +}); + +Element.Methods.Simulated = { + hasAttribute: function(element, attribute) { + var t = Element._attributeTranslations; + attribute = t.names[attribute] || attribute; + return $(element).getAttributeNode(attribute).specified; + } +}; + +// IE is missing .innerHTML support for TABLE-related elements +if (document.all && !window.opera){ + Element.Methods.update = function(element, html) { + element = $(element); + html = typeof html == 'undefined' ? '' : html.toString(); + var tagName = element.tagName.toUpperCase(); + if (['THEAD','TBODY','TR','TD'].include(tagName)) { + var div = document.createElement('div'); + switch (tagName) { + case 'THEAD': + case 'TBODY': + div.innerHTML = '<table><tbody>' + html.stripScripts() + '</tbody></table>'; + depth = 2; + break; + case 'TR': + div.innerHTML = '<table><tbody><tr>' + html.stripScripts() + '</tr></tbody></table>'; + depth = 3; + break; + case 'TD': + div.innerHTML = '<table><tbody><tr><td>' + html.stripScripts() + '</td></tr></tbody></table>'; + depth = 4; + } + $A(element.childNodes).each(function(node){ + element.removeChild(node) + }); + depth.times(function(){ div = div.firstChild }); + + $A(div.childNodes).each( + function(node){ element.appendChild(node) }); + } else { + element.innerHTML = html.stripScripts(); + } + setTimeout(function() {html.evalScripts()}, 10); + return element; + } +}; + +Object.extend(Element, Element.Methods); + +var _nativeExtensions = false; + +if(/Konqueror|Safari|KHTML/.test(navigator.userAgent)) + ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) { + var className = 'HTML' + tag + 'Element'; + if(window[className]) return; + var klass = window[className] = {}; + klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__; + }); + +Element.addMethods = function(methods) { + Object.extend(Element.Methods, methods || {}); + + function copy(methods, destination, onlyIfAbsent) { + onlyIfAbsent = onlyIfAbsent || false; + var cache = Element.extend.cache; + for (var property in methods) { + var value = methods[property]; + if (!onlyIfAbsent || !(property in destination)) + destination[property] = cache.findOrStore(value); + } + } + + if (typeof HTMLElement != 'undefined') { + copy(Element.Methods, HTMLElement.prototype); + copy(Element.Methods.Simulated, HTMLElement.prototype, true); + copy(Form.Methods, HTMLFormElement.prototype); + [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) { + copy(Form.Element.Methods, klass.prototype); + }); + _nativeExtensions = true; + } +} + +var Toggle = new Object(); +Toggle.display = Element.toggle; + +/*--------------------------------------------------------------------------*/ + +Abstract.Insertion = function(adjacency) { + this.adjacency = adjacency; +} + +Abstract.Insertion.prototype = { + initialize: function(element, content) { + this.element = $(element); + this.content = content.stripScripts(); + + if (this.adjacency && this.element.insertAdjacentHTML) { + try { + this.element.insertAdjacentHTML(this.adjacency, this.content); + } catch (e) { + var tagName = this.element.tagName.toUpperCase(); + if (['TBODY', 'TR'].include(tagName)) { + this.insertContent(this.contentFromAnonymousTable()); + } else { + throw e; + } + } + } else { + this.range = this.element.ownerDocument.createRange(); + if (this.initializeRange) this.initializeRange(); + this.insertContent([this.range.createContextualFragment(this.content)]); + } + + setTimeout(function() {content.evalScripts()}, 10); + }, + + contentFromAnonymousTable: function() { + var div = document.createElement('div'); + div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>'; + return $A(div.childNodes[0].childNodes[0].childNodes); + } +} + +var Insertion = new Object(); + +Insertion.Before = Class.create(); +Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), { + initializeRange: function() { + this.range.setStartBefore(this.element); + }, + + insertContent: function(fragments) { + fragments.each((function(fragment) { + this.element.parentNode.insertBefore(fragment, this.element); + }).bind(this)); + } +}); + +Insertion.Top = Class.create(); +Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), { + initializeRange: function() { + this.range.selectNodeContents(this.element); + this.range.collapse(true); + }, + + insertContent: function(fragments) { + fragments.reverse(false).each((function(fragment) { + this.element.insertBefore(fragment, this.element.firstChild); + }).bind(this)); + } +}); + +Insertion.Bottom = Class.create(); +Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), { + initializeRange: function() { + this.range.selectNodeContents(this.element); + this.range.collapse(this.element); + }, + + insertContent: function(fragments) { + fragments.each((function(fragment) { + this.element.appendChild(fragment); + }).bind(this)); + } +}); + +Insertion.After = Class.create(); +Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), { + initializeRange: function() { + this.range.setStartAfter(this.element); + }, + + insertContent: function(fragments) { + fragments.each((function(fragment) { + this.element.parentNode.insertBefore(fragment, + this.element.nextSibling); + }).bind(this)); + } +}); + +/*--------------------------------------------------------------------------*/ + +Element.ClassNames = Class.create(); +Element.ClassNames.prototype = { + initialize: function(element) { + this.element = $(element); + }, + + _each: function(iterator) { + this.element.className.split(/\s+/).select(function(name) { + return name.length > 0; + })._each(iterator); + }, + + set: function(className) { + this.element.className = className; + }, + + add: function(classNameToAdd) { + if (this.include(classNameToAdd)) return; + this.set($A(this).concat(classNameToAdd).join(' ')); + }, + + remove: function(classNameToRemove) { + if (!this.include(classNameToRemove)) return; + this.set($A(this).without(classNameToRemove).join(' ')); + }, + + toString: function() { + return $A(this).join(' '); + } +}; + +Object.extend(Element.ClassNames.prototype, Enumerable); +var Selector = Class.create(); +Selector.prototype = { + initialize: function(expression) { + this.params = {classNames: []}; + this.expression = expression.toString().strip(); + this.parseExpression(); + this.compileMatcher(); + }, + + parseExpression: function() { + function abort(message) { throw 'Parse error in selector: ' + message; } + + if (this.expression == '') abort('empty expression'); + + var params = this.params, expr = this.expression, match, modifier, clause, rest; + while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) { + params.attributes = params.attributes || []; + params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''}); + expr = match[1]; + } + + if (expr == '*') return this.params.wildcard = true; + + while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) { + modifier = match[1], clause = match[2], rest = match[3]; + switch (modifier) { + case '#': params.id = clause; break; + case '.': params.classNames.push(clause); break; + case '': + case undefined: params.tagName = clause.toUpperCase(); break; + default: abort(expr.inspect()); + } + expr = rest; + } + + if (expr.length > 0) abort(expr.inspect()); + }, + + buildMatchExpression: function() { + var params = this.params, conditions = [], clause; + + if (params.wildcard) + conditions.push('true'); + if (clause = params.id) + conditions.push('element.readAttribute("id") == ' + clause.inspect()); + if (clause = params.tagName) + conditions.push('element.tagName.toUpperCase() == ' + clause.inspect()); + if ((clause = params.classNames).length > 0) + for (var i = 0, length = clause.length; i < length; i++) + conditions.push('element.hasClassName(' + clause[i].inspect() + ')'); + if (clause = params.attributes) { + clause.each(function(attribute) { + var value = 'element.readAttribute(' + attribute.name.inspect() + ')'; + var splitValueBy = function(delimiter) { + return value + ' && ' + value + '.split(' + delimiter.inspect() + ')'; + } + + switch (attribute.operator) { + case '=': conditions.push(value + ' == ' + attribute.value.inspect()); break; + case '~=': conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break; + case '|=': conditions.push( + splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect() + ); break; + case '!=': conditions.push(value + ' != ' + attribute.value.inspect()); break; + case '': + case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break; + default: throw 'Unknown operator ' + attribute.operator + ' in selector'; + } + }); + } + + return conditions.join(' && '); + }, + + compileMatcher: function() { + this.match = new Function('element', 'if (!element.tagName) return false; \ + element = $(element); \ + return ' + this.buildMatchExpression()); + }, + + findElements: function(scope) { + var element; + + if (element = $(this.params.id)) + if (this.match(element)) + if (!scope || Element.childOf(element, scope)) + return [element]; + + scope = (scope || document).getElementsByTagName(this.params.tagName || '*'); + + var results = []; + for (var i = 0, length = scope.length; i < length; i++) + if (this.match(element = scope[i])) + results.push(Element.extend(element)); + + return results; + }, + + toString: function() { + return this.expression; + } +} + +Object.extend(Selector, { + matchElements: function(elements, expression) { + var selector = new Selector(expression); + return elements.select(selector.match.bind(selector)).map(Element.extend); + }, + + findElement: function(elements, expression, index) { + if (typeof expression == 'number') index = expression, expression = false; + return Selector.matchElements(elements, expression || '*')[index || 0]; + }, + + findChildElements: function(element, expressions) { + return expressions.map(function(expression) { + return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) { + var selector = new Selector(expr); + return results.inject([], function(elements, result) { + return elements.concat(selector.findElements(result || element)); + }); + }); + }).flatten(); + } +}); + +function $$() { + return Selector.findChildElements(document, $A(arguments)); +} +var Form = { + reset: function(form) { + $(form).reset(); + return form; + }, + + serializeElements: function(elements, getHash) { + var data = elements.inject({}, function(result, element) { + if (!element.disabled && element.name) { + var key = element.name, value = $(element).getValue(); + if (value != undefined) { + if (result[key]) { + if (result[key].constructor != Array) result[key] = [result[key]]; + result[key].push(value); + } + else result[key] = value; + } + } + return result; + }); + + return getHash ? data : Hash.toQueryString(data); + } +}; + +Form.Methods = { + serialize: function(form, getHash) { + return Form.serializeElements(Form.getElements(form), getHash); + }, + + getElements: function(form) { + return $A($(form).getElementsByTagName('*')).inject([], + function(elements, child) { + if (Form.Element.Serializers[child.tagName.toLowerCase()]) + elements.push(Element.extend(child)); + return elements; + } + ); + }, + + getInputs: function(form, typeName, name) { + form = $(form); + var inputs = form.getElementsByTagName('input'); + + if (!typeName && !name) return $A(inputs).map(Element.extend); + + for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) { + var input = inputs[i]; + if ((typeName && input.type != typeName) || (name && input.name != name)) + continue; + matchingInputs.push(Element.extend(input)); + } + + return matchingInputs; + }, + + disable: function(form) { + form = $(form); + form.getElements().each(function(element) { + element.blur(); + element.disabled = 'true'; + }); + return form; + }, + + enable: function(form) { + form = $(form); + form.getElements().each(function(element) { + element.disabled = ''; + }); + return form; + }, + + findFirstElement: function(form) { + return $(form).getElements().find(function(element) { + return element.type != 'hidden' && !element.disabled && + ['input', 'select', 'textarea'].include(element.tagName.toLowerCase()); + }); + }, + + focusFirstElement: function(form) { + form = $(form); + form.findFirstElement().activate(); + return form; + } +} + +Object.extend(Form, Form.Methods); + +/*--------------------------------------------------------------------------*/ + +Form.Element = { + focus: function(element) { + $(element).focus(); + return element; + }, + + select: function(element) { + $(element).select(); + return element; + } +} + +Form.Element.Methods = { + serialize: function(element) { + element = $(element); + if (!element.disabled && element.name) { + var value = element.getValue(); + if (value != undefined) { + var pair = {}; + pair[element.name] = value; + return Hash.toQueryString(pair); + } + } + return ''; + }, + + getValue: function(element) { + element = $(element); + var method = element.tagName.toLowerCase(); + return Form.Element.Serializers[method](element); + }, + + clear: function(element) { + $(element).value = ''; + return element; + }, + + present: function(element) { + return $(element).value != ''; + }, + + activate: function(element) { + element = $(element); + element.focus(); + if (element.select && ( element.tagName.toLowerCase() != 'input' || + !['button', 'reset', 'submit'].include(element.type) ) ) + element.select(); + return element; + }, + + disable: function(element) { + element = $(element); + element.disabled = true; + return element; + }, + + enable: function(element) { + element = $(element); + element.blur(); + element.disabled = false; + return element; + } +} + +Object.extend(Form.Element, Form.Element.Methods); +var Field = Form.Element; +var $F = Form.Element.getValue; + +/*--------------------------------------------------------------------------*/ + +Form.Element.Serializers = { + input: function(element) { + switch (element.type.toLowerCase()) { + case 'checkbox': + case 'radio': + return Form.Element.Serializers.inputSelector(element); + default: + return Form.Element.Serializers.textarea(element); + } + }, + + inputSelector: function(element) { + return element.checked ? element.value : null; + }, + + textarea: function(element) { + return element.value; + }, + + select: function(element) { + return this[element.type == 'select-one' ? + 'selectOne' : 'selectMany'](element); + }, + + selectOne: function(element) { + var index = element.selectedIndex; + return index >= 0 ? this.optionValue(element.options[index]) : null; + }, + + selectMany: function(element) { + var values, length = element.length; + if (!length) return null; + + for (var i = 0, values = []; i < length; i++) { + var opt = element.options[i]; + if (opt.selected) values.push(this.optionValue(opt)); + } + return values; + }, + + optionValue: function(opt) { + // extend element because hasAttribute may not be native + return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text; + } +} + +/*--------------------------------------------------------------------------*/ + +Abstract.TimedObserver = function() {} +Abstract.TimedObserver.prototype = { + initialize: function(element, frequency, callback) { + this.frequency = frequency; + this.element = $(element); + this.callback = callback; + + this.lastValue = this.getValue(); + this.registerCallback(); + }, + + registerCallback: function() { + setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); + }, + + onTimerEvent: function() { + var value = this.getValue(); + var changed = ('string' == typeof this.lastValue && 'string' == typeof value + ? this.lastValue != value : String(this.lastValue) != String(value)); + if (changed) { + this.callback(this.element, value); + this.lastValue = value; + } + } +} + +Form.Element.Observer = Class.create(); +Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { + getValue: function() { + return Form.Element.getValue(this.element); + } +}); + +Form.Observer = Class.create(); +Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { + getValue: function() { + return Form.serialize(this.element); + } +}); + +/*--------------------------------------------------------------------------*/ + +Abstract.EventObserver = function() {} +Abstract.EventObserver.prototype = { + initialize: function(element, callback) { + this.element = $(element); + this.callback = callback; + + this.lastValue = this.getValue(); + if (this.element.tagName.toLowerCase() == 'form') + this.registerFormCallbacks(); + else + this.registerCallback(this.element); + }, + + onElementEvent: function() { + var value = this.getValue(); + if (this.lastValue != value) { + this.callback(this.element, value); + this.lastValue = value; + } + }, + + registerFormCallbacks: function() { + Form.getElements(this.element).each(this.registerCallback.bind(this)); + }, + + registerCallback: function(element) { + if (element.type) { + switch (element.type.toLowerCase()) { + case 'checkbox': + case 'radio': + Event.observe(element, 'click', this.onElementEvent.bind(this)); + break; + default: + Event.observe(element, 'change', this.onElementEvent.bind(this)); + break; + } + } + } +} + +Form.Element.EventObserver = Class.create(); +Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { + getValue: function() { + return Form.Element.getValue(this.element); + } +}); + +Form.EventObserver = Class.create(); +Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { + getValue: function() { + return Form.serialize(this.element); + } +}); +if (!window.Event) { + var Event = new Object(); +} + +Object.extend(Event, { + KEY_BACKSPACE: 8, + KEY_TAB: 9, + KEY_RETURN: 13, + KEY_ESC: 27, + KEY_LEFT: 37, + KEY_UP: 38, + KEY_RIGHT: 39, + KEY_DOWN: 40, + KEY_DELETE: 46, + KEY_HOME: 36, + KEY_END: 35, + KEY_PAGEUP: 33, + KEY_PAGEDOWN: 34, + + element: function(event) { + return event.target || event.srcElement; + }, + + isLeftClick: function(event) { + return (((event.which) && (event.which == 1)) || + ((event.button) && (event.button == 1))); + }, + + pointerX: function(event) { + return event.pageX || (event.clientX + + (document.documentElement.scrollLeft || document.body.scrollLeft)); + }, + + pointerY: function(event) { + return event.pageY || (event.clientY + + (document.documentElement.scrollTop || document.body.scrollTop)); + }, + + stop: function(event) { + if (event.preventDefault) { + event.preventDefault(); + event.stopPropagation(); + } else { + event.returnValue = false; + event.cancelBubble = true; + } + }, + + // find the first node with the given tagName, starting from the + // node the event was triggered on; traverses the DOM upwards + findElement: function(event, tagName) { + var element = Event.element(event); + while (element.parentNode && (!element.tagName || + (element.tagName.toUpperCase() != tagName.toUpperCase()))) + element = element.parentNode; + return element; + }, + + observers: false, + + _observeAndCache: function(element, name, observer, useCapture) { + if (!this.observers) this.observers = []; + if (element.addEventListener) { + this.observers.push([element, name, observer, useCapture]); + element.addEventListener(name, observer, useCapture); + } else if (element.attachEvent) { + this.observers.push([element, name, observer, useCapture]); + element.attachEvent('on' + name, observer); + } + }, + + unloadCache: function() { + if (!Event.observers) return; + for (var i = 0, length = Event.observers.length; i < length; i++) { + Event.stopObserving.apply(this, Event.observers[i]); + Event.observers[i][0] = null; + } + Event.observers = false; + }, + + observe: function(element, name, observer, useCapture) { + element = $(element); + useCapture = useCapture || false; + + if (name == 'keypress' && + (navigator.appVersion.match(/Konqueror|Safari|KHTML/) + || element.attachEvent)) + name = 'keydown'; + + Event._observeAndCache(element, name, observer, useCapture); + }, + + stopObserving: function(element, name, observer, useCapture) { + element = $(element); + useCapture = useCapture || false; + + if (name == 'keypress' && + (navigator.appVersion.match(/Konqueror|Safari|KHTML/) + || element.detachEvent)) + name = 'keydown'; + + if (element.removeEventListener) { + element.removeEventListener(name, observer, useCapture); + } else if (element.detachEvent) { + try { + element.detachEvent('on' + name, observer); + } catch (e) {} + } + } +}); + +/* prevent memory leaks in IE */ +if (navigator.appVersion.match(/\bMSIE\b/)) + Event.observe(window, 'unload', Event.unloadCache, false); +var Position = { + // set to true if needed, warning: firefox performance problems + // NOT neeeded for page scrolling, only if draggable contained in + // scrollable elements + includeScrollOffsets: false, + + // must be called before calling withinIncludingScrolloffset, every time the + // page is scrolled + prepare: function() { + this.deltaX = window.pageXOffset + || document.documentElement.scrollLeft + || document.body.scrollLeft + || 0; + this.deltaY = window.pageYOffset + || document.documentElement.scrollTop + || document.body.scrollTop + || 0; + }, + + realOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.scrollTop || 0; + valueL += element.scrollLeft || 0; + element = element.parentNode; + } while (element); + return [valueL, valueT]; + }, + + cumulativeOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + element = element.offsetParent; + } while (element); + return [valueL, valueT]; + }, + + positionedOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + element = element.offsetParent; + if (element) { + if(element.tagName=='BODY') break; + var p = Element.getStyle(element, 'position'); + if (p == 'relative' || p == 'absolute') break; + } + } while (element); + return [valueL, valueT]; + }, + + offsetParent: function(element) { + if (element.offsetParent) return element.offsetParent; + if (element == document.body) return element; + + while ((element = element.parentNode) && element != document.body) + if (Element.getStyle(element, 'position') != 'static') + return element; + + return document.body; + }, + + // caches x/y coordinate pair to use with overlap + within: function(element, x, y) { + if (this.includeScrollOffsets) + return this.withinIncludingScrolloffsets(element, x, y); + this.xcomp = x; + this.ycomp = y; + this.offset = this.cumulativeOffset(element); + + return (y >= this.offset[1] && + y < this.offset[1] + element.offsetHeight && + x >= this.offset[0] && + x < this.offset[0] + element.offsetWidth); + }, + + withinIncludingScrolloffsets: function(element, x, y) { + var offsetcache = this.realOffset(element); + + this.xcomp = x + offsetcache[0] - this.deltaX; + this.ycomp = y + offsetcache[1] - this.deltaY; + this.offset = this.cumulativeOffset(element); + + return (this.ycomp >= this.offset[1] && + this.ycomp < this.offset[1] + element.offsetHeight && + this.xcomp >= this.offset[0] && + this.xcomp < this.offset[0] + element.offsetWidth); + }, + + // within must be called directly before + overlap: function(mode, element) { + if (!mode) return 0; + if (mode == 'vertical') + return ((this.offset[1] + element.offsetHeight) - this.ycomp) / + element.offsetHeight; + if (mode == 'horizontal') + return ((this.offset[0] + element.offsetWidth) - this.xcomp) / + element.offsetWidth; + }, + + page: function(forElement) { + var valueT = 0, valueL = 0; + + var element = forElement; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + + // Safari fix + if (element.offsetParent==document.body) + if (Element.getStyle(element,'position')=='absolute') break; + + } while (element = element.offsetParent); + + element = forElement; + do { + if (!window.opera || element.tagName=='BODY') { + valueT -= element.scrollTop || 0; + valueL -= element.scrollLeft || 0; + } + } while (element = element.parentNode); + + return [valueL, valueT]; + }, + + clone: function(source, target) { + var options = Object.extend({ + setLeft: true, + setTop: true, + setWidth: true, + setHeight: true, + offsetTop: 0, + offsetLeft: 0 + }, arguments[2] || {}) + + // find page position of source + source = $(source); + var p = Position.page(source); + + // find coordinate system to use + target = $(target); + var delta = [0, 0]; + var parent = null; + // delta [0,0] will do fine with position: fixed elements, + // position:absolute needs offsetParent deltas + if (Element.getStyle(target,'position') == 'absolute') { + parent = Position.offsetParent(target); + delta = Position.page(parent); + } + + // correct by body offsets (fixes Safari) + if (parent == document.body) { + delta[0] -= document.body.offsetLeft; + delta[1] -= document.body.offsetTop; + } + + // set position + if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; + if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; + if(options.setWidth) target.style.width = source.offsetWidth + 'px'; + if(options.setHeight) target.style.height = source.offsetHeight + 'px'; + }, + + absolutize: function(element) { + element = $(element); + if (element.style.position == 'absolute') return; + Position.prepare(); + + var offsets = Position.positionedOffset(element); + var top = offsets[1]; + var left = offsets[0]; + var width = element.clientWidth; + var height = element.clientHeight; + + element._originalLeft = left - parseFloat(element.style.left || 0); + element._originalTop = top - parseFloat(element.style.top || 0); + element._originalWidth = element.style.width; + element._originalHeight = element.style.height; + + element.style.position = 'absolute'; + element.style.top = top + 'px'; + element.style.left = left + 'px'; + element.style.width = width + 'px'; + element.style.height = height + 'px'; + }, + + relativize: function(element) { + element = $(element); + if (element.style.position == 'relative') return; + Position.prepare(); + + element.style.position = 'relative'; + var top = parseFloat(element.style.top || 0) - (element._originalTop || 0); + var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); + + element.style.top = top + 'px'; + element.style.left = left + 'px'; + element.style.height = element._originalHeight; + element.style.width = element._originalWidth; + } +} + +// Safari returns margins on body which is incorrect if the child is absolutely +// positioned. For performance reasons, redefine Position.cumulativeOffset for +// KHTML/WebKit only. +if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { + Position.cumulativeOffset = function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + if (element.offsetParent == document.body) + if (Element.getStyle(element, 'position') == 'absolute') break; + + element = element.offsetParent; + } while (element); + + return [valueL, valueT]; + } +} + +Element.addMethods(); \ No newline at end of file Copied: trunk/theme/src/bin/portal-ajax-war/dyna/scriptaculous.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/scriptaculous.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/scriptaculous.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/scriptaculous.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,51 @@ +// script.aculo.us scriptaculous.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +var Scriptaculous = { + Version: '1.7.0', + require: function(libraryName) { + // inserting via DOM fails in Safari 2.0, so brute force approach + document.write('<script type="text/javascript" src="'+libraryName+'"></script>'); + }, + load: function() { + if((typeof Prototype=='undefined') || + (typeof Element == 'undefined') || + (typeof Element.Methods=='undefined') || + parseFloat(Prototype.Version.split(".")[0] + "." + + Prototype.Version.split(".")[1]) < 1.5) + throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0"); + + $A(document.getElementsByTagName("script")).findAll( function(s) { + return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/)) + }).each( function(s) { + var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,''); + var includes = s.src.match(/\?.*load=([a-z,]*)/); + (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider').split(',').each( + function(include) { Scriptaculous.require(path+include+'.js') }); + }); + } +} + +Scriptaculous.load(); \ No newline at end of file Copied: trunk/theme/src/bin/portal-ajax-war/dyna/slider.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/slider.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/slider.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/slider.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,278 @@ +// script.aculo.us slider.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +if(!Control) var Control = {}; +Control.Slider = Class.create(); + +// options: +// axis: 'vertical', or 'horizontal' (default) +// +// callbacks: +// onChange(value) +// onSlide(value) +Control.Slider.prototype = { + initialize: function(handle, track, options) { + var slider = this; + + if(handle instanceof Array) { + this.handles = handle.collect( function(e) { return $(e) }); + } else { + this.handles = [$(handle)]; + } + + this.track = $(track); + this.options = options || {}; + + this.axis = this.options.axis || 'horizontal'; + this.increment = this.options.increment || 1; + this.step = parseInt(this.options.step || '1'); + this.range = this.options.range || $R(0,1); + + this.value = 0; // assure backwards compat + this.values = this.handles.map( function() { return 0 }); + this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false; + this.options.startSpan = $(this.options.startSpan || null); + this.options.endSpan = $(this.options.endSpan || null); + + this.restricted = this.options.restricted || false; + + this.maximum = this.options.maximum || this.range.end; + this.minimum = this.options.minimum || this.range.start; + + // Will be used to align the handle onto the track, if necessary + this.alignX = parseInt(this.options.alignX || '0'); + this.alignY = parseInt(this.options.alignY || '0'); + + this.trackLength = this.maximumOffset() - this.minimumOffset(); + + this.handleLength = this.isVertical() ? + (this.handles[0].offsetHeight != 0 ? + this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : + (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : + this.handles[0].style.width.replace(/px$/,"")); + + this.active = false; + this.dragging = false; + this.disabled = false; + + if(this.options.disabled) this.setDisabled(); + + // Allowed values array + this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false; + if(this.allowedValues) { + this.minimum = this.allowedValues.min(); + this.maximum = this.allowedValues.max(); + } + + this.eventMouseDown = this.startDrag.bindAsEventListener(this); + this.eventMouseUp = this.endDrag.bindAsEventListener(this); + this.eventMouseMove = this.update.bindAsEventListener(this); + + // Initialize handles in reverse (make sure first handle is active) + this.handles.each( function(h,i) { + i = slider.handles.length-1-i; + slider.setValue(parseFloat( + (slider.options.sliderValue instanceof Array ? + slider.options.sliderValue[i] : slider.options.sliderValue) || + slider.range.start), i); + Element.makePositioned(h); // fix IE + Event.observe(h, "mousedown", slider.eventMouseDown); + }); + + Event.observe(this.track, "mousedown", this.eventMouseDown); + Event.observe(document, "mouseup", this.eventMouseUp); + Event.observe(document, "mousemove", this.eventMouseMove); + + this.initialized = true; + }, + dispose: function() { + var slider = this; + Event.stopObserving(this.track, "mousedown", this.eventMouseDown); + Event.stopObserving(document, "mouseup", this.eventMouseUp); + Event.stopObserving(document, "mousemove", this.eventMouseMove); + this.handles.each( function(h) { + Event.stopObserving(h, "mousedown", slider.eventMouseDown); + }); + }, + setDisabled: function(){ + this.disabled = true; + }, + setEnabled: function(){ + this.disabled = false; + }, + getNearestValue: function(value){ + if(this.allowedValues){ + if(value >= this.allowedValues.max()) return(this.allowedValues.max()); + if(value <= this.allowedValues.min()) return(this.allowedValues.min()); + + var offset = Math.abs(this.allowedValues[0] - value); + var newValue = this.allowedValues[0]; + this.allowedValues.each( function(v) { + var currentOffset = Math.abs(v - value); + if(currentOffset <= offset){ + newValue = v; + offset = currentOffset; + } + }); + return newValue; + } + if(value > this.range.end) return this.range.end; + if(value < this.range.start) return this.range.start; + return value; + }, + setValue: function(sliderValue, handleIdx){ + if(!this.active) { + this.activeHandleIdx = handleIdx || 0; + this.activeHandle = this.handles[this.activeHandleIdx]; + this.updateStyles(); + } + handleIdx = handleIdx || this.activeHandleIdx || 0; + if(this.initialized && this.restricted) { + if((handleIdx>0) && (sliderValue<this.values[handleIdx-1])) + sliderValue = this.values[handleIdx-1]; + if((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1])) + sliderValue = this.values[handleIdx+1]; + } + sliderValue = this.getNearestValue(sliderValue); + this.values[handleIdx] = sliderValue; + this.value = this.values[0]; // assure backwards compat + + this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = + this.translateToPx(sliderValue); + + this.drawSpans(); + if(!this.dragging || !this.event) this.updateFinished(); + }, + setValueBy: function(delta, handleIdx) { + this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, + handleIdx || this.activeHandleIdx || 0); + }, + translateToPx: function(value) { + return Math.round( + ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * + (value - this.range.start)) + "px"; + }, + translateToValue: function(offset) { + return ((offset/(this.trackLength-this.handleLength) * + (this.range.end-this.range.start)) + this.range.start); + }, + getRange: function(range) { + var v = this.values.sortBy(Prototype.K); + range = range || 0; + return $R(v[range],v[range+1]); + }, + minimumOffset: function(){ + return(this.isVertical() ? this.alignY : this.alignX); + }, + maximumOffset: function(){ + return(this.isVertical() ? + (this.track.offsetHeight != 0 ? this.track.offsetHeight : + this.track.style.height.replace(/px$/,"")) - this.alignY : + (this.track.offsetWidth != 0 ? this.track.offsetWidth : + this.track.style.width.replace(/px$/,"")) - this.alignY); + }, + isVertical: function(){ + return (this.axis == 'vertical'); + }, + drawSpans: function() { + var slider = this; + if(this.spans) + $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) }); + if(this.options.startSpan) + this.setSpan(this.options.startSpan, + $R(0, this.values.length>1 ? this.getRange(0).min() : this.value )); + if(this.options.endSpan) + this.setSpan(this.options.endSpan, + $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum)); + }, + setSpan: function(span, range) { + if(this.isVertical()) { + span.style.top = this.translateToPx(range.start); + span.style.height = this.translateToPx(range.end - range.start + this.range.start); + } else { + span.style.left = this.translateToPx(range.start); + span.style.width = this.translateToPx(range.end - range.start + this.range.start); + } + }, + updateStyles: function() { + this.handles.each( function(h){ Element.removeClassName(h, 'selected') }); + Element.addClassName(this.activeHandle, 'selected'); + }, + startDrag: function(event) { + if(Event.isLeftClick(event)) { + if(!this.disabled){ + this.active = true; + + var handle = Event.element(event); + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + var track = handle; + if(track==this.track) { + var offsets = Position.cumulativeOffset(this.track); + this.event = event; + this.setValue(this.translateToValue( + (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2) + )); + var offsets = Position.cumulativeOffset(this.activeHandle); + this.offsetX = (pointer[0] - offsets[0]); + this.offsetY = (pointer[1] - offsets[1]); + } else { + // find the handle (prevents issues with Safari) + while((this.handles.indexOf(handle) == -1) && handle.parentNode) + handle = handle.parentNode; + + if(this.handles.indexOf(handle)!=-1) { + this.activeHandle = handle; + this.activeHandleIdx = this.handles.indexOf(this.activeHandle); + this.updateStyles(); + + var offsets = Position.cumulativeOffset(this.activeHandle); + this.offsetX = (pointer[0] - offsets[0]); + this.offsetY = (pointer[1] - offsets[1]); + } + } + } + Event.stop(event); + } + }, + update: function(event) { + if(this.active) { + if(!this.dragging) this.dragging = true; + this.draw(event); + // fix AppleWebKit rendering + if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); + Event.stop(event); + } + }, + draw: function(event) { + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + var offsets = Position.cumulativeOffset(this.track); + pointer[0] -= this.offsetX + offsets[0]; + pointer[1] -= this.offsetY + offsets[1]; + this.event = event; + this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] )); + if(this.initialized && this.options.onSlide) + this.options.onSlide(this.values.length>1 ? this.values : this.value, this); + }, + endDrag: function(event) { + if(this.active && this.dragging) { + this.finishDrag(event, true); + Event.stop(event); + } + this.active = false; + this.dragging = false; + }, + finishDrag: function(event, success) { + this.active = false; + this.dragging = false; + this.updateFinished(); + }, + updateFinished: function() { + if(this.initialized && this.options.onChange) + this.options.onChange(this.values.length>1 ? this.values : this.value, this); + this.event = null; + } +} \ No newline at end of file Added: trunk/theme/src/bin/portal-ajax-war/dyna/style.css =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/style.css (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,8 @@ +/* We need the min-height in order to have a region that is never empty and can receive draggables + min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation. + 32 pixels is the height of the region when it is empty. */ +div.dyna-region { + min-height:32px; + height:auto !important; + height:32px; +} Copied: trunk/theme/src/bin/portal-ajax-war/dyna/unittest.js (from rev 6933, trunk/theme/src/bin/portal-ajax-war/js/portal/unittest.js) =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/unittest.js (rev 0) +++ trunk/theme/src/bin/portal-ajax-war/dyna/unittest.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -0,0 +1,564 @@ +// script.aculo.us unittest.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 + +// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) +// (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/) +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// experimental, Firefox-only +Event.simulateMouse = function(element, eventName) { + var options = Object.extend({ + pointerX: 0, + pointerY: 0, + buttons: 0, + ctrlKey: false, + altKey: false, + shiftKey: false, + metaKey: false + }, arguments[2] || {}); + var oEvent = document.createEvent("MouseEvents"); + oEvent.initMouseEvent(eventName, true, true, document.defaultView, + options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, + options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element)); + + if(this.mark) Element.remove(this.mark); + this.mark = document.createElement('div'); + this.mark.appendChild(document.createTextNode(" ")); + document.body.appendChild(this.mark); + this.mark.style.position = 'absolute'; + this.mark.style.top = options.pointerY + "px"; + this.mark.style.left = options.pointerX + "px"; + this.mark.style.width = "5px"; + this.mark.style.height = "5px;"; + this.mark.style.borderTop = "1px solid red;" + this.mark.style.borderLeft = "1px solid red;" + + if(this.step) + alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); + + $(element).dispatchEvent(oEvent); +}; + +// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2. +// You need to downgrade to 1.0.4 for now to get this working +// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much +Event.simulateKey = function(element, eventName) { + var options = Object.extend({ + ctrlKey: false, + altKey: false, + shiftKey: false, + metaKey: false, + keyCode: 0, + charCode: 0 + }, arguments[2] || {}); + + var oEvent = document.createEvent("KeyEvents"); + oEvent.initKeyEvent(eventName, true, true, window, + options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, + options.keyCode, options.charCode ); + $(element).dispatchEvent(oEvent); +}; + +Event.simulateKeys = function(element, command) { + for(var i=0; i<command.length; i++) { + Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)}); + } +}; + +var Test = {} +Test.Unit = {}; + +// security exception workaround +Test.Unit.inspect = Object.inspect; + +Test.Unit.Logger = Class.create(); +Test.Unit.Logger.prototype = { + initialize: function(log) { + this.log = $(log); + if (this.log) { + this._createLogTable(); + } + }, + start: function(testName) { + if (!this.log) return; + this.testName = testName; + this.lastLogLine = document.createElement('tr'); + this.statusCell = document.createElement('td'); + this.nameCell = document.createElement('td'); + this.nameCell.className = "nameCell"; + this.nameCell.appendChild(document.createTextNode(testName)); + this.messageCell = document.createElement('td'); + this.lastLogLine.appendChild(this.statusCell); + this.lastLogLine.appendChild(this.nameCell); + this.lastLogLine.appendChild(this.messageCell); + this.loglines.appendChild(this.lastLogLine); + }, + finish: function(status, summary) { + if (!this.log) return; + this.lastLogLine.className = status; + this.statusCell.innerHTML = status; + this.messageCell.innerHTML = this._toHTML(summary); + this.addLinksToResults(); + }, + message: function(message) { + if (!this.log) return; + this.messageCell.innerHTML = this._toHTML(message); + }, + summary: function(summary) { + if (!this.log) return; + this.logsummary.innerHTML = this._toHTML(summary); + }, + _createLogTable: function() { + this.log.innerHTML = + '<div id="logsummary"></div>' + + '<table id="logtable">' + + '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' + + '<tbody id="loglines"></tbody>' + + '</table>'; + this.logsummary = $('logsummary') + this.loglines = $('loglines'); + }, + _toHTML: function(txt) { + return txt.escapeHTML().replace(/\n/g,"<br/>"); + }, + addLinksToResults: function(){ + $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log + td.title = "Run only this test" + Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;}); + }); + $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log + td.title = "Run all tests" + Event.observe(td, 'click', function(){ window.location.search = "";}); + }); + } +} + +Test.Unit.Runner = Class.create(); +Test.Unit.Runner.prototype = { + initialize: function(testcases) { + this.options = Object.extend({ + testLog: 'testlog' + }, arguments[1] || {}); + this.options.resultsURL = this.parseResultsURLQueryParameter(); + this.options.tests = this.parseTestsQueryParameter(); + if (this.options.testLog) { + this.options.testLog = $(this.options.testLog) || null; + } + if(this.options.tests) { + this.tests = []; + for(var i = 0; i < this.options.tests.length; i++) { + if(/^test/.test(this.options.tests[i])) { + this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"])); + } + } + } else { + if (this.options.test) { + this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])]; + } else { + this.tests = []; + for(var testcase in testcases) { + if(/^test/.test(testcase)) { + this.tests.push( + new Test.Unit.Testcase( + this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, + testcases[testcase], testcases["setup"], testcases["teardown"] + )); + } + } + } + } + this.currentTest = 0; + this.logger = new Test.Unit.Logger(this.options.testLog); + setTimeout(this.runTests.bind(this), 1000); + }, + parseResultsURLQueryParameter: function() { + return window.location.search.parseQuery()["resultsURL"]; + }, + parseTestsQueryParameter: function(){ + if (window.location.search.parseQuery()["tests"]){ + return window.location.search.parseQuery()["tests"].split(','); + }; + }, + // Returns: + // "ERROR" if there was an error, + // "FAILURE" if there was a failure, or + // "SUCCESS" if there was neither + getResult: function() { + var hasFailure = false; + for(var i=0;i<this.tests.length;i++) { + if (this.tests[i].errors > 0) { + return "ERROR"; + } + if (this.tests[i].failures > 0) { + hasFailure = true; + } + } + if (hasFailure) { + return "FAILURE"; + } else { + return "SUCCESS"; + } + }, + postResults: function() { + if (this.options.resultsURL) { + new Ajax.Request(this.options.resultsURL, + { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false }); + } + }, + runTests: function() { + var test = this.tests[this.currentTest]; + if (!test) { + // finished! + this.postResults(); + this.logger.summary(this.summary()); + return; + } + if(!test.isWaiting) { + this.logger.start(test.name); + } + test.run(); + if(test.isWaiting) { + this.logger.message("Waiting for " + test.timeToWait + "ms"); + setTimeout(this.runTests.bind(this), test.timeToWait || 1000); + } else { + this.logger.finish(test.status(), test.summary()); + this.currentTest++; + // tail recursive, hopefully the browser will skip the stackframe + this.runTests(); + } + }, + summary: function() { + var assertions = 0; + var failures = 0; + var errors = 0; + var messages = []; + for(var i=0;i<this.tests.length;i++) { + assertions += this.tests[i].assertions; + failures += this.tests[i].failures; + errors += this.tests[i].errors; + } + return ( + (this.options.context ? this.options.context + ': ': '') + + this.tests.length + " tests, " + + assertions + " assertions, " + + failures + " failures, " + + errors + " errors"); + } +} + +Test.Unit.Assertions = Class.create(); +Test.Unit.Assertions.prototype = { + initialize: function() { + this.assertions = 0; + this.failures = 0; + this.errors = 0; + this.messages = []; + }, + summary: function() { + return ( + this.assertions + " assertions, " + + this.failures + " failures, " + + this.errors + " errors" + "\n" + + this.messages.join("\n")); + }, + pass: function() { + this.assertions++; + }, + fail: function(message) { + this.failures++; + this.messages.push("Failure: " + message); + }, + info: function(message) { + this.messages.push("Info: " + message); + }, + error: function(error) { + this.errors++; + this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")"); + }, + status: function() { + if (this.failures > 0) return 'failed'; + if (this.errors > 0) return 'error'; + return 'passed'; + }, + assert: function(expression) { + var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"'; + try { expression ? this.pass() : + this.fail(message); } + catch(e) { this.error(e); } + }, + assertEqual: function(expected, actual) { + var message = arguments[2] || "assertEqual"; + try { (expected == actual) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertInspect: function(expected, actual) { + var message = arguments[2] || "assertInspect"; + try { (expected == actual.inspect()) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertEnumEqual: function(expected, actual) { + var message = arguments[2] || "assertEnumEqual"; + try { $A(expected).length == $A(actual).length && + expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ? + this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + + ', actual ' + Test.Unit.inspect(actual)); } + catch(e) { this.error(e); } + }, + assertNotEqual: function(expected, actual) { + var message = arguments[2] || "assertNotEqual"; + try { (expected != actual) ? this.pass() : + this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertIdentical: function(expected, actual) { + var message = arguments[2] || "assertIdentical"; + try { (expected === actual) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertNotIdentical: function(expected, actual) { + var message = arguments[2] || "assertNotIdentical"; + try { !(expected === actual) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertNull: function(obj) { + var message = arguments[1] || 'assertNull' + try { (obj==null) ? this.pass() : + this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); } + catch(e) { this.error(e); } + }, + assertMatch: function(expected, actual) { + var message = arguments[2] || 'assertMatch'; + var regex = new RegExp(expected); + try { (regex.exec(actual)) ? this.pass() : + this.fail(message + ' : regex: "' + Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } + }, + assertHidden: function(element) { + var message = arguments[1] || 'assertHidden'; + this.assertEqual("none", element.style.display, message); + }, + assertNotNull: function(object) { + var message = arguments[1] || 'assertNotNull'; + this.assert(object != null, message); + }, + assertType: function(expected, actual) { + var message = arguments[2] || 'assertType'; + try { + (actual.constructor == expected) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + (actual.constructor) + '"'); } + catch(e) { this.error(e); } + }, + assertNotOfType: function(expected, actual) { + var message = arguments[2] || 'assertNotOfType'; + try { + (actual.constructor != expected) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + (actual.constructor) + '"'); } + catch(e) { this.error(e); } + }, + assertInstanceOf: function(expected, actual) { + var message = arguments[2] || 'assertInstanceOf'; + try { + (actual instanceof expected) ? this.pass() : + this.fail(message + ": object was not an instance of the expected type"); } + catch(e) { this.error(e); } + }, + assertNotInstanceOf: function(expected, actual) { + var message = arguments[2] || 'assertNotInstanceOf'; + try { + !(actual instanceof expected) ? this.pass() : + this.fail(message + ": object was an instance of the not expected type"); } + catch(e) { this.error(e); } + }, + assertRespondsTo: function(method, obj) { + var message = arguments[2] || 'assertRespondsTo'; + try { + (obj[method] && typeof obj[method] == 'function') ? this.pass() : + this.fail(message + ": object doesn't respond to [" + method + "]"); } + catch(e) { this.error(e); } + }, + assertReturnsTrue: function(method, obj) { + var message = arguments[2] || 'assertReturnsTrue'; + try { + var m = obj[method]; + if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; + m() ? this.pass() : + this.fail(message + ": method returned false"); } + catch(e) { this.error(e); } + }, + assertReturnsFalse: function(method, obj) { + var message = arguments[2] || 'assertReturnsFalse'; + try { + var m = obj[method]; + if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; + !m() ? this.pass() : + this.fail(message + ": method returned true"); } + catch(e) { this.error(e); } + }, + assertRaise: function(exceptionName, method) { + var message = arguments[2] || 'assertRaise'; + try { + method(); + this.fail(message + ": exception expected but none was raised"); } + catch(e) { + ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); + } + }, + assertElementsMatch: function() { + var expressions = $A(arguments), elements = $A(expressions.shift()); + if (elements.length != expressions.length) { + this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions'); + return false; + } + elements.zip(expressions).all(function(pair, index) { + var element = $(pair.first()), expression = pair.last(); + if (element.match(expression)) return true; + this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect()); + }.bind(this)) && this.pass(); + }, + assertElementMatches: function(element, expression) { + this.assertElementsMatch([element], expression); + }, + benchmark: function(operation, iterations) { + var startAt = new Date(); + (iterations || 1).times(operation); + var timeTaken = ((new Date())-startAt); + this.info((arguments[2] || 'Operation') + ' finished ' + + iterations + ' iterations in ' + (timeTaken/1000)+'s' ); + return timeTaken; + }, + _isVisible: function(element) { + element = $(element); + if(!element.parentNode) return true; + this.assertNotNull(element); + if(element.style && Element.getStyle(element, 'display') == 'none') + return false; + + return this._isVisible(element.parentNode); + }, + assertNotVisible: function(element) { + this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1])); + }, + assertVisible: function(element) { + this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1])); + }, + benchmark: function(operation, iterations) { + var startAt = new Date(); + (iterations || 1).times(operation); + var timeTaken = ((new Date())-startAt); + this.info((arguments[2] || 'Operation') + ' finished ' + + iterations + ' iterations in ' + (timeTaken/1000)+'s' ); + return timeTaken; + } +} + +Test.Unit.Testcase = Class.create(); +Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), { + initialize: function(name, test, setup, teardown) { + Test.Unit.Assertions.prototype.initialize.bind(this)(); + this.name = name; + + if(typeof test == 'string') { + test = test.gsub(/(\.should[^$]+\()/,'#{0}this,'); + test = test.gsub(/(\.should[^\(]+)\(this,$/,'#{1}(this)'); + this.test = function() { + eval('with(this){'+test+'}'); + } + } else { + this.test = test || function() {}; + } + + this.setup = setup || function() {}; + this.teardown = teardown || function() {}; + this.isWaiting = false; + this.timeToWait = 1000; + }, + wait: function(time, nextPart) { + this.isWaiting = true; + this.test = nextPart; + this.timeToWait = time; + }, + run: function() { + try { + try { + if (!this.isWaiting) this.setup.bind(this)(); + this.isWaiting = false; + this.test.bind(this)(); + } finally { + if(!this.isWaiting) { + this.teardown.bind(this)(); + } + } + } + catch(e) { this.error(e); } + } +}); + +// *EXPERIMENTAL* BDD-style testing to please non-technical folk +// This draws many ideas from RSpec http://rspec.rubyforge.org/ + +Test.setupBDDExtensionMethods = function(){ + var METHODMAP = { + shouldEqual: 'assertEqual', + shouldNotEqual: 'assertNotEqual', + shouldEqualEnum: 'assertEnumEqual', + shouldBeA: 'assertType', + shouldNotBeA: 'assertNotOfType', + shouldBeAn: 'assertType', + shouldNotBeAn: 'assertNotOfType', + shouldBeNull: 'assertNull', + shouldNotBeNull: 'assertNotNull', + + shouldBe: 'assertReturnsTrue', + shouldNotBe: 'assertReturnsFalse', + shouldRespondTo: 'assertRespondsTo' + }; + Test.BDDMethods = {}; + for(m in METHODMAP) { + Test.BDDMethods[m] = eval( + 'function(){'+ + 'var args = $A(arguments);'+ + 'var scope = args.shift();'+ + 'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }'); + } + [Array.prototype, String.prototype, Number.prototype].each( + function(p){ Object.extend(p, Test.BDDMethods) } + ); +} + +Test.context = function(name, spec, log){ + Test.setupBDDExtensionMethods(); + + var compiledSpec = {}; + var titles = {}; + for(specName in spec) { + switch(specName){ + case "setup": + case "teardown": + compiledSpec[specName] = spec[specName]; + break; + default: + var testName = 'test'+specName.gsub(/\s+/,'-').camelize(); + var body = spec[specName].toString().split('\n').slice(1); + if(/^\{/.test(body[0])) body = body.slice(1); + body.pop(); + body = body.map(function(statement){ + return statement.strip() + }); + compiledSpec[testName] = body.join('\n'); + titles[testName] = specName; + } + } + new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name }); +}; \ No newline at end of file Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/builder.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/builder.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/builder.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,131 +0,0 @@ -// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -var Builder = { - NODEMAP: { - AREA: 'map', - CAPTION: 'table', - COL: 'table', - COLGROUP: 'table', - LEGEND: 'fieldset', - OPTGROUP: 'select', - OPTION: 'select', - PARAM: 'object', - TBODY: 'table', - TD: 'table', - TFOOT: 'table', - TH: 'table', - THEAD: 'table', - TR: 'table' - }, - // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken, - // due to a Firefox bug - node: function(elementName) { - elementName = elementName.toUpperCase(); - - // try innerHTML approach - var parentTag = this.NODEMAP[elementName] || 'div'; - var parentElement = document.createElement(parentTag); - try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707 - parentElement.innerHTML = "<" + elementName + "></" + elementName + ">"; - } catch(e) {} - var element = parentElement.firstChild || null; - - // see if browser added wrapping tags - if(element && (element.tagName.toUpperCase() != elementName)) - element = element.getElementsByTagName(elementName)[0]; - - // fallback to createElement approach - if(!element) element = document.createElement(elementName); - - // abort if nothing could be created - if(!element) return; - - // attributes (or text) - if(arguments[1]) - if(this._isStringOrNumber(arguments[1]) || - (arguments[1] instanceof Array)) { - this._children(element, arguments[1]); - } else { - var attrs = this._attributes(arguments[1]); - if(attrs.length) { - try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707 - parentElement.innerHTML = "<" +elementName + " " + - attrs + "></" + elementName + ">"; - } catch(e) {} - element = parentElement.firstChild || null; - // workaround firefox 1.0.X bug - if(!element) { - element = document.createElement(elementName); - for(attr in arguments[1]) - element[attr == 'class' ? 'className' : attr] = arguments[1][attr]; - } - if(element.tagName.toUpperCase() != elementName) - element = parentElement.getElementsByTagName(elementName)[0]; - } - } - - // text, or array of children - if(arguments[2]) - this._children(element, arguments[2]); - - return element; - }, - _text: function(text) { - return document.createTextNode(text); - }, - - ATTR_MAP: { - 'className': 'class', - 'htmlFor': 'for' - }, - - _attributes: function(attributes) { - var attrs = []; - for(attribute in attributes) - attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) + - '="' + attributes[attribute].toString().escapeHTML() + '"'); - return attrs.join(" "); - }, - _children: function(element, children) { - if(typeof children=='object') { // array can hold nodes and text - children.flatten().each( function(e) { - if(typeof e=='object') - element.appendChild(e) - else - if(Builder._isStringOrNumber(e)) - element.appendChild(Builder._text(e)); - }); - } else - if(Builder._isStringOrNumber(children)) - element.appendChild(Builder._text(children)); - }, - _isStringOrNumber: function(param) { - return(typeof param=='string' || typeof param=='number'); - }, - build: function(html) { - var element = this.node('div'); - $(element).update(html.strip()); - return element.down(); - }, - dump: function(scope) { - if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope - - var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " + - "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " + - "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+ - "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+ - "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+ - "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/); - - tags.each( function(tag){ - scope[tag] = function() { - return Builder.node.apply(Builder, [tag].concat($A(arguments))); - } - }); - } -} Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/controls.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/controls.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/controls.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,835 +0,0 @@ -// script.aculo.us controls.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan) -// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) -// Contributors: -// Richard Livsey -// Rahul Bhargava -// Rob Wills -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -// Autocompleter.Base handles all the autocompletion functionality -// that's independent of the data source for autocompletion. This -// includes drawing the autocompletion menu, observing keyboard -// and mouse events, and similar. -// -// Specific autocompleters need to provide, at the very least, -// a getUpdatedChoices function that will be invoked every time -// the text inside the monitored textbox changes. This method -// should get the text for which to provide autocompletion by -// invoking this.getToken(), NOT by directly accessing -// this.element.value. This is to allow incremental tokenized -// autocompletion. Specific auto-completion logic (AJAX, etc) -// belongs in getUpdatedChoices. -// -// Tokenized incremental autocompletion is enabled automatically -// when an autocompleter is instantiated with the 'tokens' option -// in the options parameter, e.g.: -// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' }); -// will incrementally autocomplete with a comma as the token. -// Additionally, ',' in the above example can be replaced with -// a token array, e.g. { tokens: [',', '\n'] } which -// enables autocompletion on multiple tokens. This is most -// useful when one of the tokens is \n (a newline), as it -// allows smart autocompletion after linebreaks. - -if(typeof Effect == 'undefined') - throw("controls.js requires including script.aculo.us' effects.js library"); - -var Autocompleter = {} -Autocompleter.Base = function() {}; -Autocompleter.Base.prototype = { - baseInitialize: function(element, update, options) { - this.element = $(element); - this.update = $(update); - this.hasFocus = false; - this.changed = false; - this.active = false; - this.index = 0; - this.entryCount = 0; - - if(this.setOptions) - this.setOptions(options); - else - this.options = options || {}; - - this.options.paramName = this.options.paramName || this.element.name; - this.options.tokens = this.options.tokens || []; - this.options.frequency = this.options.frequency || 0.4; - this.options.minChars = this.options.minChars || 1; - this.options.onShow = this.options.onShow || - function(element, update){ - if(!update.style.position || update.style.position=='absolute') { - update.style.position = 'absolute'; - Position.clone(element, update, { - setHeight: false, - offsetTop: element.offsetHeight - }); - } - Effect.Appear(update,{duration:0.15}); - }; - this.options.onHide = this.options.onHide || - function(element, update){ new Effect.Fade(update,{duration:0.15}) }; - - if(typeof(this.options.tokens) == 'string') - this.options.tokens = new Array(this.options.tokens); - - this.observer = null; - - this.element.setAttribute('autocomplete','off'); - - Element.hide(this.update); - - Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this)); - Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this)); - }, - - show: function() { - if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); - if(!this.iefix && - (navigator.appVersion.indexOf('MSIE')>0) && - (navigator.userAgent.indexOf('Opera')<0) && - (Element.getStyle(this.update, 'position')=='absolute')) { - new Insertion.After(this.update, - '<iframe id="' + this.update.id + '_iefix" '+ - 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + - 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>'); - this.iefix = $(this.update.id+'_iefix'); - } - if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); - }, - - fixIEOverlapping: function() { - Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); - this.iefix.style.zIndex = 1; - this.update.style.zIndex = 2; - Element.show(this.iefix); - }, - - hide: function() { - this.stopIndicator(); - if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update); - if(this.iefix) Element.hide(this.iefix); - }, - - startIndicator: function() { - if(this.options.indicator) Element.show(this.options.indicator); - }, - - stopIndicator: function() { - if(this.options.indicator) Element.hide(this.options.indicator); - }, - - onKeyPress: function(event) { - if(this.active) - switch(event.keyCode) { - case Event.KEY_TAB: - case Event.KEY_RETURN: - this.selectEntry(); - Event.stop(event); - case Event.KEY_ESC: - this.hide(); - this.active = false; - Event.stop(event); - return; - case Event.KEY_LEFT: - case Event.KEY_RIGHT: - return; - case Event.KEY_UP: - this.markPrevious(); - this.render(); - if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event); - return; - case Event.KEY_DOWN: - this.markNext(); - this.render(); - if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event); - return; - } - else - if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || - (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) return; - - this.changed = true; - this.hasFocus = true; - - if(this.observer) clearTimeout(this.observer); - this.observer = - setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); - }, - - activate: function() { - this.changed = false; - this.hasFocus = true; - this.getUpdatedChoices(); - }, - - onHover: function(event) { - var element = Event.findElement(event, 'LI'); - if(this.index != element.autocompleteIndex) - { - this.index = element.autocompleteIndex; - this.render(); - } - Event.stop(event); - }, - - onClick: function(event) { - var element = Event.findElement(event, 'LI'); - this.index = element.autocompleteIndex; - this.selectEntry(); - this.hide(); - }, - - onBlur: function(event) { - // needed to make click events working - setTimeout(this.hide.bind(this), 250); - this.hasFocus = false; - this.active = false; - }, - - render: function() { - if(this.entryCount > 0) { - for (var i = 0; i < this.entryCount; i++) - this.index==i ? - Element.addClassName(this.getEntry(i),"selected") : - Element.removeClassName(this.getEntry(i),"selected"); - - if(this.hasFocus) { - this.show(); - this.active = true; - } - } else { - this.active = false; - this.hide(); - } - }, - - markPrevious: function() { - if(this.index > 0) this.index-- - else this.index = this.entryCount-1; - this.getEntry(this.index).scrollIntoView(true); - }, - - markNext: function() { - if(this.index < this.entryCount-1) this.index++ - else this.index = 0; - this.getEntry(this.index).scrollIntoView(false); - }, - - getEntry: function(index) { - return this.update.firstChild.childNodes[index]; - }, - - getCurrentEntry: function() { - return this.getEntry(this.index); - }, - - selectEntry: function() { - this.active = false; - this.updateElement(this.getCurrentEntry()); - }, - - updateElement: function(selectedElement) { - if (this.options.updateElement) { - this.options.updateElement(selectedElement); - return; - } - var value = ''; - if (this.options.select) { - var nodes = document.getElementsByClassName(this.options.select, selectedElement) || []; - if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); - } else - value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - - var lastTokenPos = this.findLastToken(); - if (lastTokenPos != -1) { - var newValue = this.element.value.substr(0, lastTokenPos + 1); - var whitespace = this.element.value.substr(lastTokenPos + 1).match(/^\s+/); - if (whitespace) - newValue += whitespace[0]; - this.element.value = newValue + value; - } else { - this.element.value = value; - } - this.element.focus(); - - if (this.options.afterUpdateElement) - this.options.afterUpdateElement(this.element, selectedElement); - }, - - updateChoices: function(choices) { - if(!this.changed && this.hasFocus) { - this.update.innerHTML = choices; - Element.cleanWhitespace(this.update); - Element.cleanWhitespace(this.update.down()); - - if(this.update.firstChild && this.update.down().childNodes) { - this.entryCount = - this.update.down().childNodes.length; - for (var i = 0; i < this.entryCount; i++) { - var entry = this.getEntry(i); - entry.autocompleteIndex = i; - this.addObservers(entry); - } - } else { - this.entryCount = 0; - } - - this.stopIndicator(); - this.index = 0; - - if(this.entryCount==1 && this.options.autoSelect) { - this.selectEntry(); - this.hide(); - } else { - this.render(); - } - } - }, - - addObservers: function(element) { - Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this)); - Event.observe(element, "click", this.onClick.bindAsEventListener(this)); - }, - - onObserverEvent: function() { - this.changed = false; - if(this.getToken().length>=this.options.minChars) { - this.startIndicator(); - this.getUpdatedChoices(); - } else { - this.active = false; - this.hide(); - } - }, - - getToken: function() { - var tokenPos = this.findLastToken(); - if (tokenPos != -1) - var ret = this.element.value.substr(tokenPos + 1).replace(/^\s+/,'').replace(/\s+$/,''); - else - var ret = this.element.value; - - return /\n/.test(ret) ? '' : ret; - }, - - findLastToken: function() { - var lastTokenPos = -1; - - for (var i=0; i<this.options.tokens.length; i++) { - var thisTokenPos = this.element.value.lastIndexOf(this.options.tokens[i]); - if (thisTokenPos > lastTokenPos) - lastTokenPos = thisTokenPos; - } - return lastTokenPos; - } -} - -Ajax.Autocompleter = Class.create(); -Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), { - initialize: function(element, update, url, options) { - this.baseInitialize(element, update, options); - this.options.asynchronous = true; - this.options.onComplete = this.onComplete.bind(this); - this.options.defaultParams = this.options.parameters || null; - this.url = url; - }, - - getUpdatedChoices: function() { - entry = encodeURIComponent(this.options.paramName) + '=' + - encodeURIComponent(this.getToken()); - - this.options.parameters = this.options.callback ? - this.options.callback(this.element, entry) : entry; - - if(this.options.defaultParams) - this.options.parameters += '&' + this.options.defaultParams; - - new Ajax.Request(this.url, this.options); - }, - - onComplete: function(request) { - this.updateChoices(request.responseText); - } - -}); - -// The local array autocompleter. Used when you'd prefer to -// inject an array of autocompletion options into the page, rather -// than sending out Ajax queries, which can be quite slow sometimes. -// -// The constructor takes four parameters. The first two are, as usual, -// the id of the monitored textbox, and id of the autocompletion menu. -// The third is the array you want to autocomplete from, and the fourth -// is the options block. -// -// Extra local autocompletion options: -// - choices - How many autocompletion choices to offer -// -// - partialSearch - If false, the autocompleter will match entered -// text only at the beginning of strings in the -// autocomplete array. Defaults to true, which will -// match text at the beginning of any *word* in the -// strings in the autocomplete array. If you want to -// search anywhere in the string, additionally set -// the option fullSearch to true (default: off). -// -// - fullSsearch - Search anywhere in autocomplete array strings. -// -// - partialChars - How many characters to enter before triggering -// a partial match (unlike minChars, which defines -// how many characters are required to do any match -// at all). Defaults to 2. -// -// - ignoreCase - Whether to ignore case when autocompleting. -// Defaults to true. -// -// It's possible to pass in a custom function as the 'selector' -// option, if you prefer to write your own autocompletion logic. -// In that case, the other options above will not apply unless -// you support them. - -Autocompleter.Local = Class.create(); -Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), { - initialize: function(element, update, array, options) { - this.baseInitialize(element, update, options); - this.options.array = array; - }, - - getUpdatedChoices: function() { - this.updateChoices(this.options.selector(this)); - }, - - setOptions: function(options) { - this.options = Object.extend({ - choices: 10, - partialSearch: true, - partialChars: 2, - ignoreCase: true, - fullSearch: false, - selector: function(instance) { - var ret = []; // Beginning matches - var partial = []; // Inside matches - var entry = instance.getToken(); - var count = 0; - - for (var i = 0; i < instance.options.array.length && - ret.length < instance.options.choices ; i++) { - - var elem = instance.options.array[i]; - var foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase()) : - elem.indexOf(entry); - - while (foundPos != -1) { - if (foundPos == 0 && elem.length != entry.length) { - ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + - elem.substr(entry.length) + "</li>"); - break; - } else if (entry.length >= instance.options.partialChars && - instance.options.partialSearch && foundPos != -1) { - if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { - partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" + - elem.substr(foundPos, entry.length) + "</strong>" + elem.substr( - foundPos + entry.length) + "</li>"); - break; - } - } - - foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : - elem.indexOf(entry, foundPos + 1); - - } - } - if (partial.length) - ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)) - return "<ul>" + ret.join('') + "</ul>"; - } - }, options || {}); - } -}); - -// AJAX in-place editor -// -// see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor - -// Use this if you notice weird scrolling problems on some browsers, -// the DOM might be a bit confused when this gets called so do this -// waits 1 ms (with setTimeout) until it does the activation -Field.scrollFreeActivate = function(field) { - setTimeout(function() { - Field.activate(field); - }, 1); -} - -Ajax.InPlaceEditor = Class.create(); -Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99"; -Ajax.InPlaceEditor.prototype = { - initialize: function(element, url, options) { - this.url = url; - this.element = $(element); - - this.options = Object.extend({ - paramName: "value", - okButton: true, - okText: "ok", - cancelLink: true, - cancelText: "cancel", - savingText: "Saving...", - clickToEditText: "Click to edit", - okText: "ok", - rows: 1, - onComplete: function(transport, element) { - new Effect.Highlight(element, {startcolor: this.options.highlightcolor}); - }, - onFailure: function(transport) { - alert("Error communicating with the server: " + transport.responseText.stripTags()); - }, - callback: function(form) { - return Form.serialize(form); - }, - handleLineBreaks: true, - loadingText: 'Loading...', - savingClassName: 'inplaceeditor-saving', - loadingClassName: 'inplaceeditor-loading', - formClassName: 'inplaceeditor-form', - highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor, - highlightendcolor: "#FFFFFF", - externalControl: null, - submitOnBlur: false, - ajaxOptions: {}, - evalScripts: false - }, options || {}); - - if(!this.options.formId && this.element.id) { - this.options.formId = this.element.id + "-inplaceeditor"; - if ($(this.options.formId)) { - // there's already a form with that name, don't specify an id - this.options.formId = null; - } - } - - if (this.options.externalControl) { - this.options.externalControl = $(this.options.externalControl); - } - - this.originalBackground = Element.getStyle(this.element, 'background-color'); - if (!this.originalBackground) { - this.originalBackground = "transparent"; - } - - this.element.title = this.options.clickToEditText; - - this.onclickListener = this.enterEditMode.bindAsEventListener(this); - this.mouseoverListener = this.enterHover.bindAsEventListener(this); - this.mouseoutListener = this.leaveHover.bindAsEventListener(this); - Event.observe(this.element, 'click', this.onclickListener); - Event.observe(this.element, 'mouseover', this.mouseoverListener); - Event.observe(this.element, 'mouseout', this.mouseoutListener); - if (this.options.externalControl) { - Event.observe(this.options.externalControl, 'click', this.onclickListener); - Event.observe(this.options.externalControl, 'mouseover', this.mouseoverListener); - Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener); - } - }, - enterEditMode: function(evt) { - if (this.saving) return; - if (this.editing) return; - this.editing = true; - this.onEnterEditMode(); - if (this.options.externalControl) { - Element.hide(this.options.externalControl); - } - Element.hide(this.element); - this.createForm(); - this.element.parentNode.insertBefore(this.form, this.element); - if (!this.options.loadTextURL) Field.scrollFreeActivate(this.editField); - // stop the event to avoid a page refresh in Safari - if (evt) { - Event.stop(evt); - } - return false; - }, - createForm: function() { - this.form = document.createElement("form"); - this.form.id = this.options.formId; - Element.addClassName(this.form, this.options.formClassName) - this.form.onsubmit = this.onSubmit.bind(this); - - this.createEditField(); - - if (this.options.textarea) { - var br = document.createElement("br"); - this.form.appendChild(br); - } - - if (this.options.okButton) { - okButton = document.createElement("input"); - okButton.type = "submit"; - okButton.value = this.options.okText; - okButton.className = 'editor_ok_button'; - this.form.appendChild(okButton); - } - - if (this.options.cancelLink) { - cancelLink = document.createElement("a"); - cancelLink.href = "#"; - cancelLink.appendChild(document.createTextNode(this.options.cancelText)); - cancelLink.onclick = this.onclickCancel.bind(this); - cancelLink.className = 'editor_cancel'; - this.form.appendChild(cancelLink); - } - }, - hasHTMLLineBreaks: function(string) { - if (!this.options.handleLineBreaks) return false; - return string.match(/<br/i) || string.match(/<p>/i); - }, - convertHTMLLineBreaks: function(string) { - return string.replace(/<br>/gi, "\n").replace(/<br\/>/gi, "\n").replace(/<\/p>/gi, "\n").replace(/<p>/gi, ""); - }, - createEditField: function() { - var text; - if(this.options.loadTextURL) { - text = this.options.loadingText; - } else { - text = this.getText(); - } - - var obj = this; - - if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) { - this.options.textarea = false; - var textField = document.createElement("input"); - textField.obj = this; - textField.type = "text"; - textField.name = this.options.paramName; - textField.value = text; - textField.style.backgroundColor = this.options.highlightcolor; - textField.className = 'editor_field'; - var size = this.options.size || this.options.cols || 0; - if (size != 0) textField.size = size; - if (this.options.submitOnBlur) - textField.onblur = this.onSubmit.bind(this); - this.editField = textField; - } else { - this.options.textarea = true; - var textArea = document.createElement("textarea"); - textArea.obj = this; - textArea.name = this.options.paramName; - textArea.value = this.convertHTMLLineBreaks(text); - textArea.rows = this.options.rows; - textArea.cols = this.options.cols || 40; - textArea.className = 'editor_field'; - if (this.options.submitOnBlur) - textArea.onblur = this.onSubmit.bind(this); - this.editField = textArea; - } - - if(this.options.loadTextURL) { - this.loadExternalText(); - } - this.form.appendChild(this.editField); - }, - getText: function() { - return this.element.innerHTML; - }, - loadExternalText: function() { - Element.addClassName(this.form, this.options.loadingClassName); - this.editField.disabled = true; - new Ajax.Request( - this.options.loadTextURL, - Object.extend({ - asynchronous: true, - onComplete: this.onLoadedExternalText.bind(this) - }, this.options.ajaxOptions) - ); - }, - onLoadedExternalText: function(transport) { - Element.removeClassName(this.form, this.options.loadingClassName); - this.editField.disabled = false; - this.editField.value = transport.responseText.stripTags(); - Field.scrollFreeActivate(this.editField); - }, - onclickCancel: function() { - this.onComplete(); - this.leaveEditMode(); - return false; - }, - onFailure: function(transport) { - this.options.onFailure(transport); - if (this.oldInnerHTML) { - this.element.innerHTML = this.oldInnerHTML; - this.oldInnerHTML = null; - } - return false; - }, - onSubmit: function() { - // onLoading resets these so we need to save them away for the Ajax call - var form = this.form; - var value = this.editField.value; - - // do this first, sometimes the ajax call returns before we get a chance to switch on Saving... - // which means this will actually switch on Saving... *after* we've left edit mode causing Saving... - // to be displayed indefinitely - this.onLoading(); - - if (this.options.evalScripts) { - new Ajax.Request( - this.url, Object.extend({ - parameters: this.options.callback(form, value), - onComplete: this.onComplete.bind(this), - onFailure: this.onFailure.bind(this), - asynchronous:true, - evalScripts:true - }, this.options.ajaxOptions)); - } else { - new Ajax.Updater( - { success: this.element, - // don't update on failure (this could be an option) - failure: null }, - this.url, Object.extend({ - parameters: this.options.callback(form, value), - onComplete: this.onComplete.bind(this), - onFailure: this.onFailure.bind(this) - }, this.options.ajaxOptions)); - } - // stop the event to avoid a page refresh in Safari - if (arguments.length > 1) { - Event.stop(arguments[0]); - } - return false; - }, - onLoading: function() { - this.saving = true; - this.removeForm(); - this.leaveHover(); - this.showSaving(); - }, - showSaving: function() { - this.oldInnerHTML = this.element.innerHTML; - this.element.innerHTML = this.options.savingText; - Element.addClassName(this.element, this.options.savingClassName); - this.element.style.backgroundColor = this.originalBackground; - Element.show(this.element); - }, - removeForm: function() { - if(this.form) { - if (this.form.parentNode) Element.remove(this.form); - this.form = null; - } - }, - enterHover: function() { - if (this.saving) return; - this.element.style.backgroundColor = this.options.highlightcolor; - if (this.effect) { - this.effect.cancel(); - } - Element.addClassName(this.element, this.options.hoverClassName) - }, - leaveHover: function() { - if (this.options.backgroundColor) { - this.element.style.backgroundColor = this.oldBackground; - } - Element.removeClassName(this.element, this.options.hoverClassName) - if (this.saving) return; - this.effect = new Effect.Highlight(this.element, { - startcolor: this.options.highlightcolor, - endcolor: this.options.highlightendcolor, - restorecolor: this.originalBackground - }); - }, - leaveEditMode: function() { - Element.removeClassName(this.element, this.options.savingClassName); - this.removeForm(); - this.leaveHover(); - this.element.style.backgroundColor = this.originalBackground; - Element.show(this.element); - if (this.options.externalControl) { - Element.show(this.options.externalControl); - } - this.editing = false; - this.saving = false; - this.oldInnerHTML = null; - this.onLeaveEditMode(); - }, - onComplete: function(transport) { - this.leaveEditMode(); - this.options.onComplete.bind(this)(transport, this.element); - }, - onEnterEditMode: function() {}, - onLeaveEditMode: function() {}, - dispose: function() { - if (this.oldInnerHTML) { - this.element.innerHTML = this.oldInnerHTML; - } - this.leaveEditMode(); - Event.stopObserving(this.element, 'click', this.onclickListener); - Event.stopObserving(this.element, 'mouseover', this.mouseoverListener); - Event.stopObserving(this.element, 'mouseout', this.mouseoutListener); - if (this.options.externalControl) { - Event.stopObserving(this.options.externalControl, 'click', this.onclickListener); - Event.stopObserving(this.options.externalControl, 'mouseover', this.mouseoverListener); - Event.stopObserving(this.options.externalControl, 'mouseout', this.mouseoutListener); - } - } -}; - -Ajax.InPlaceCollectionEditor = Class.create(); -Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype); -Object.extend(Ajax.InPlaceCollectionEditor.prototype, { - createEditField: function() { - if (!this.cached_selectTag) { - var selectTag = document.createElement("select"); - var collection = this.options.collection || []; - var optionTag; - collection.each(function(e,i) { - optionTag = document.createElement("option"); - optionTag.value = (e instanceof Array) ? e[0] : e; - if((typeof this.options.value == 'undefined') && - ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true; - if(this.options.value==optionTag.value) optionTag.selected = true; - optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e)); - selectTag.appendChild(optionTag); - }.bind(this)); - this.cached_selectTag = selectTag; - } - - this.editField = this.cached_selectTag; - if(this.options.loadTextURL) this.loadExternalText(); - this.form.appendChild(this.editField); - this.options.callback = function(form, value) { - return "value=" + encodeURIComponent(value); - } - } -}); - -// Delayed observer, like Form.Element.Observer, -// but waits for delay after last key input -// Ideal for live-search fields - -Form.Element.DelayedObserver = Class.create(); -Form.Element.DelayedObserver.prototype = { - initialize: function(element, delay, callback) { - this.delay = delay || 0.5; - this.element = $(element); - this.callback = callback; - this.timer = null; - this.lastValue = $F(this.element); - Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); - }, - delayedListener: function(event) { - if(this.lastValue == $F(this.element)) return; - if(this.timer) clearTimeout(this.timer); - this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000); - this.lastValue = $F(this.element); - }, - onTimerEvent: function() { - this.timer = null; - this.callback(this.element, $F(this.element)); - } -}; Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/dragdrop.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/dragdrop.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/dragdrop.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,944 +0,0 @@ -// script.aculo.us dragdrop.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi(a)oriontransfer.co.nz) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -if(typeof Effect == 'undefined') - throw("dragdrop.js requires including script.aculo.us' effects.js library"); - -var Droppables = { - drops: [], - - remove: function(element) { - this.drops = this.drops.reject(function(d) { return d.element==$(element) }); - }, - - add: function(element) { - element = $(element); - var options = Object.extend({ - greedy: true, - hoverclass: null, - tree: false - }, arguments[1] || {}); - - // cache containers - if(options.containment) { - options._containers = []; - var containment = options.containment; - if((typeof containment == 'object') && - (containment.constructor == Array)) { - containment.each( function(c) { options._containers.push($(c)) }); - } else { - options._containers.push($(containment)); - } - } - - if(options.accept) options.accept = [options.accept].flatten(); - - Element.makePositioned(element); // fix IE - options.element = element; - - this.drops.push(options); - }, - - findDeepestChild: function(drops) { - deepest = drops[0]; - - for (i = 1; i < drops.length; ++i) - if (Element.isParent(drops[i].element, deepest.element)) - deepest = drops[i]; - - return deepest; - }, - - isContained: function(element, drop) { - var containmentNode; - if(drop.tree) { - containmentNode = element.treeNode; - } else { - containmentNode = element.parentNode; - } - return drop._containers.detect(function(c) { return containmentNode == c }); - }, - - isAffected: function(point, element, drop) { - return ( - (drop.element!=element) && - ((!drop._containers) || - this.isContained(element, drop)) && - ((!drop.accept) || - (Element.classNames(element).detect( - function(v) { return drop.accept.include(v) } ) )) && - Position.within(drop.element, point[0], point[1]) ); - }, - - deactivate: function(drop) { - if(drop.hoverclass) - Element.removeClassName(drop.element, drop.hoverclass); - this.last_active = null; - }, - - activate: function(drop) { - if(drop.hoverclass) - Element.addClassName(drop.element, drop.hoverclass); - this.last_active = drop; - }, - - show: function(point, element) { - if(!this.drops.length) return; - var affected = []; - - if(this.last_active) this.deactivate(this.last_active); - this.drops.each( function(drop) { - if(Droppables.isAffected(point, element, drop)) - affected.push(drop); - }); - - if(affected.length>0) { - drop = Droppables.findDeepestChild(affected); - Position.within(drop.element, point[0], point[1]); - if(drop.onHover) - drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); - - Droppables.activate(drop); - } - }, - - fire: function(event, element) { - if(!this.last_active) return; - Position.prepare(); - - if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) - if (this.last_active.onDrop) - this.last_active.onDrop(element, this.last_active.element, event); - }, - - reset: function() { - if(this.last_active) - this.deactivate(this.last_active); - } -} - -var Draggables = { - drags: [], - observers: [], - - register: function(draggable) { - if(this.drags.length == 0) { - this.eventMouseUp = this.endDrag.bindAsEventListener(this); - this.eventMouseMove = this.updateDrag.bindAsEventListener(this); - this.eventKeypress = this.keyPress.bindAsEventListener(this); - - Event.observe(document, "mouseup", this.eventMouseUp); - Event.observe(document, "mousemove", this.eventMouseMove); - Event.observe(document, "keypress", this.eventKeypress); - } - this.drags.push(draggable); - }, - - unregister: function(draggable) { - this.drags = this.drags.reject(function(d) { return d==draggable }); - if(this.drags.length == 0) { - Event.stopObserving(document, "mouseup", this.eventMouseUp); - Event.stopObserving(document, "mousemove", this.eventMouseMove); - Event.stopObserving(document, "keypress", this.eventKeypress); - } - }, - - activate: function(draggable) { - if(draggable.options.delay) { - this._timeout = setTimeout(function() { - Draggables._timeout = null; - window.focus(); - Draggables.activeDraggable = draggable; - }.bind(this), draggable.options.delay); - } else { - window.focus(); // allows keypress events if window isn't currently focused, fails for Safari - this.activeDraggable = draggable; - } - }, - - deactivate: function() { - this.activeDraggable = null; - }, - - updateDrag: function(event) { - if(!this.activeDraggable) return; - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - // Mozilla-based browsers fire successive mousemove events with - // the same coordinates, prevent needless redrawing (moz bug?) - if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; - this._lastPointer = pointer; - - this.activeDraggable.updateDrag(event, pointer); - }, - - endDrag: function(event) { - if(this._timeout) { - clearTimeout(this._timeout); - this._timeout = null; - } - if(!this.activeDraggable) return; - this._lastPointer = null; - this.activeDraggable.endDrag(event); - this.activeDraggable = null; - }, - - keyPress: function(event) { - if(this.activeDraggable) - this.activeDraggable.keyPress(event); - }, - - addObserver: function(observer) { - this.observers.push(observer); - this._cacheObserverCallbacks(); - }, - - removeObserver: function(element) { // element instead of observer fixes mem leaks - this.observers = this.observers.reject( function(o) { return o.element==element }); - this._cacheObserverCallbacks(); - }, - - notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' - if(this[eventName+'Count'] > 0) - this.observers.each( function(o) { - if(o[eventName]) o[eventName](eventName, draggable, event); - }); - if(draggable.options[eventName]) draggable.options[eventName](draggable, event); - }, - - _cacheObserverCallbacks: function() { - ['onStart','onEnd','onDrag'].each( function(eventName) { - Draggables[eventName+'Count'] = Draggables.observers.select( - function(o) { return o[eventName]; } - ).length; - }); - } -} - -/*--------------------------------------------------------------------------*/ - -var Draggable = Class.create(); -Draggable._dragging = {}; - -Draggable.prototype = { - initialize: function(element) { - var defaults = { - handle: false, - reverteffect: function(element, top_offset, left_offset) { - var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; - new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur, - queue: {scope:'_draggable', position:'end'} - }); - }, - endeffect: function(element) { - var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, - queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){ - Draggable._dragging[element] = false - } - }); - }, - zindex: 1000, - revert: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } - delay: 0 - }; - - if(!arguments[1] || typeof arguments[1].endeffect == 'undefined') - Object.extend(defaults, { - starteffect: function(element) { - element._opacity = Element.getOpacity(element); - Draggable._dragging[element] = true; - new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); - } - }); - - var options = Object.extend(defaults, arguments[1] || {}); - - this.element = $(element); - - if(options.handle && (typeof options.handle == 'string')) - this.handle = this.element.down('.'+options.handle, 0); - - if(!this.handle) this.handle = $(options.handle); - if(!this.handle) this.handle = this.element; - - if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { - options.scroll = $(options.scroll); - this._isScrollChild = Element.childOf(this.element, options.scroll); - } - - Element.makePositioned(this.element); // fix IE - - this.delta = this.currentDelta(); - this.options = options; - this.dragging = false; - - this.eventMouseDown = this.initDrag.bindAsEventListener(this); - Event.observe(this.handle, "mousedown", this.eventMouseDown); - - Draggables.register(this); - }, - - destroy: function() { - Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); - Draggables.unregister(this); - }, - - currentDelta: function() { - return([ - parseInt(Element.getStyle(this.element,'left') || '0'), - parseInt(Element.getStyle(this.element,'top') || '0')]); - }, - - initDrag: function(event) { - if(typeof Draggable._dragging[this.element] != 'undefined' && - Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { - // abort on form elements, fixes a Firefox issue - var src = Event.element(event); - if((tag_name = src.tagName.toUpperCase()) && ( - tag_name=='INPUT' || - tag_name=='SELECT' || - tag_name=='OPTION' || - tag_name=='BUTTON' || - tag_name=='TEXTAREA')) return; - - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var pos = Position.cumulativeOffset(this.element); - this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); - - Draggables.activate(this); - Event.stop(event); - } - }, - - startDrag: function(event) { - this.dragging = true; - - if(this.options.zindex) { - this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); - this.element.style.zIndex = this.options.zindex; - } - - if(this.options.ghosting) { - this._clone = this.element.cloneNode(true); - Position.absolutize(this.element); - this.element.parentNode.insertBefore(this._clone, this.element); - } - - if(this.options.scroll) { - if (this.options.scroll == window) { - var where = this._getWindowScroll(this.options.scroll); - this.originalScrollLeft = where.left; - this.originalScrollTop = where.top; - } else { - this.originalScrollLeft = this.options.scroll.scrollLeft; - this.originalScrollTop = this.options.scroll.scrollTop; - } - } - - Draggables.notify('onStart', this, event); - - if(this.options.starteffect) this.options.starteffect(this.element); - }, - - updateDrag: function(event, pointer) { - if(!this.dragging) this.startDrag(event); - Position.prepare(); - Droppables.show(pointer, this.element); - Draggables.notify('onDrag', this, event); - - this.draw(pointer); - if(this.options.change) this.options.change(this); - - if(this.options.scroll) { - this.stopScrolling(); - - var p; - if (this.options.scroll == window) { - with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } - } else { - p = Position.page(this.options.scroll); - p[0] += this.options.scroll.scrollLeft + Position.deltaX; - p[1] += this.options.scroll.scrollTop + Position.deltaY; - p.push(p[0]+this.options.scroll.offsetWidth); - p.push(p[1]+this.options.scroll.offsetHeight); - } - var speed = [0,0]; - if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity); - if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity); - if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity); - if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); - this.startScrolling(speed); - } - - // fix AppleWebKit rendering - if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); - - Event.stop(event); - }, - - finishDrag: function(event, success) { - this.dragging = false; - - if(this.options.ghosting) { - Position.relativize(this.element); - Element.remove(this._clone); - this._clone = null; - } - - if(success) Droppables.fire(event, this.element); - Draggables.notify('onEnd', this, event); - - var revert = this.options.revert; - if(revert && typeof revert == 'function') revert = revert(this.element); - - var d = this.currentDelta(); - if(revert && this.options.reverteffect) { - this.options.reverteffect(this.element, - d[1]-this.delta[1], d[0]-this.delta[0]); - } else { - this.delta = d; - } - - if(this.options.zindex) - this.element.style.zIndex = this.originalZ; - - if(this.options.endeffect) - this.options.endeffect(this.element); - - Draggables.deactivate(this); - Droppables.reset(); - }, - - keyPress: function(event) { - if(event.keyCode!=Event.KEY_ESC) return; - this.finishDrag(event, false); - Event.stop(event); - }, - - endDrag: function(event) { - if(!this.dragging) return; - this.stopScrolling(); - this.finishDrag(event, true); - Event.stop(event); - }, - - draw: function(point) { - var pos = Position.cumulativeOffset(this.element); - if(this.options.ghosting) { - var r = Position.realOffset(this.element); - pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; - } - - var d = this.currentDelta(); - pos[0] -= d[0]; pos[1] -= d[1]; - - if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { - pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; - pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; - } - - var p = [0,1].map(function(i){ - return (point[i]-pos[i]-this.offset[i]) - }.bind(this)); - - if(this.options.snap) { - if(typeof this.options.snap == 'function') { - p = this.options.snap(p[0],p[1],this); - } else { - if(this.options.snap instanceof Array) { - p = p.map( function(v, i) { - return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this)) - } else { - p = p.map( function(v) { - return Math.round(v/this.options.snap)*this.options.snap }.bind(this)) - } - }} - - var style = this.element.style; - if((!this.options.constraint) || (this.options.constraint=='horizontal')) - style.left = p[0] + "px"; - if((!this.options.constraint) || (this.options.constraint=='vertical')) - style.top = p[1] + "px"; - - if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering - }, - - stopScrolling: function() { - if(this.scrollInterval) { - clearInterval(this.scrollInterval); - this.scrollInterval = null; - Draggables._lastScrollPointer = null; - } - }, - - startScrolling: function(speed) { - if(!(speed[0] || speed[1])) return; - this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; - this.lastScrolled = new Date(); - this.scrollInterval = setInterval(this.scroll.bind(this), 10); - }, - - scroll: function() { - var current = new Date(); - var delta = current - this.lastScrolled; - this.lastScrolled = current; - if(this.options.scroll == window) { - with (this._getWindowScroll(this.options.scroll)) { - if (this.scrollSpeed[0] || this.scrollSpeed[1]) { - var d = delta / 1000; - this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] ); - } - } - } else { - this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; - this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; - } - - Position.prepare(); - Droppables.show(Draggables._lastPointer, this.element); - Draggables.notify('onDrag', this); - if (this._isScrollChild) { - Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer); - Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000; - Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000; - if (Draggables._lastScrollPointer[0] < 0) - Draggables._lastScrollPointer[0] = 0; - if (Draggables._lastScrollPointer[1] < 0) - Draggables._lastScrollPointer[1] = 0; - this.draw(Draggables._lastScrollPointer); - } - - if(this.options.change) this.options.change(this); - }, - - _getWindowScroll: function(w) { - var T, L, W, H; - with (w.document) { - if (w.document.documentElement && documentElement.scrollTop) { - T = documentElement.scrollTop; - L = documentElement.scrollLeft; - } else if (w.document.body) { - T = body.scrollTop; - L = body.scrollLeft; - } - if (w.innerWidth) { - W = w.innerWidth; - H = w.innerHeight; - } else if (w.document.documentElement && documentElement.clientWidth) { - W = documentElement.clientWidth; - H = documentElement.clientHeight; - } else { - W = body.offsetWidth; - H = body.offsetHeight - } - } - return { top: T, left: L, width: W, height: H }; - } -} - -/*--------------------------------------------------------------------------*/ - -var SortableObserver = Class.create(); -SortableObserver.prototype = { - initialize: function(element, observer) { - this.element = $(element); - this.observer = observer; - this.lastValue = Sortable.serialize(this.element); - }, - - onStart: function() { - this.lastValue = Sortable.serialize(this.element); - }, - - onEnd: function() { - Sortable.unmark(); - if(this.lastValue != Sortable.serialize(this.element)) - this.observer(this.element) - } -} - -var Sortable = { - SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - - sortables: {}, - - _findRootElement: function(element) { - while (element.tagName.toUpperCase() != "BODY") { - if(element.id && Sortable.sortables[element.id]) return element; - element = element.parentNode; - } - }, - - options: function(element) { - element = Sortable._findRootElement($(element)); - if(!element) return; - return Sortable.sortables[element.id]; - }, - - destroy: function(element){ - var s = Sortable.options(element); - - if(s) { - Draggables.removeObserver(s.element); - s.droppables.each(function(d){ Droppables.remove(d) }); - s.draggables.invoke('destroy'); - - delete Sortable.sortables[s.element.id]; - } - }, - - create: function(element) { - element = $(element); - var options = Object.extend({ - element: element, - tag: 'li', // assumes li children, override with tag: 'tagname' - dropOnEmpty: false, - tree: false, - treeTag: 'ul', - overlap: 'vertical', // one of 'vertical', 'horizontal' - constraint: 'vertical', // one of 'vertical', 'horizontal', false - containment: element, // also takes array of elements (or id's); or false - handle: false, // or a CSS class - only: false, - delay: 0, - hoverclass: null, - ghosting: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - format: this.SERIALIZE_RULE, - onChange: Prototype.emptyFunction, - onUpdate: Prototype.emptyFunction - }, arguments[1] || {}); - - // clear any old sortable with same element - this.destroy(element); - - // build options for the draggables - var options_for_draggable = { - revert: true, - scroll: options.scroll, - scrollSpeed: options.scrollSpeed, - scrollSensitivity: options.scrollSensitivity, - delay: options.delay, - ghosting: options.ghosting, - constraint: options.constraint, - handle: options.handle }; - - if(options.starteffect) - options_for_draggable.starteffect = options.starteffect; - - if(options.reverteffect) - options_for_draggable.reverteffect = options.reverteffect; - else - if(options.ghosting) options_for_draggable.reverteffect = function(element) { - element.style.top = 0; - element.style.left = 0; - }; - - if(options.endeffect) - options_for_draggable.endeffect = options.endeffect; - - if(options.zindex) - options_for_draggable.zindex = options.zindex; - - // build options for the droppables - var options_for_droppable = { - overlap: options.overlap, - containment: options.containment, - tree: options.tree, - hoverclass: options.hoverclass, - onHover: Sortable.onHover - } - - var options_for_tree = { - onHover: Sortable.onEmptyHover, - overlap: options.overlap, - containment: options.containment, - hoverclass: options.hoverclass - } - - // fix for gecko engine - Element.cleanWhitespace(element); - - options.draggables = []; - options.droppables = []; - - // drop on empty handling - if(options.dropOnEmpty || options.tree) { - Droppables.add(element, options_for_tree); - options.droppables.push(element); - } - - (this.findElements(element, options) || []).each( function(e) { - // handles are per-draggable - var handle = options.handle ? - $(e).down('.'+options.handle,0) : e; - options.draggables.push( - new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); - Droppables.add(e, options_for_droppable); - if(options.tree) e.treeNode = element; - options.droppables.push(e); - }); - - if(options.tree) { - (Sortable.findTreeElements(element, options) || []).each( function(e) { - Droppables.add(e, options_for_tree); - e.treeNode = element; - options.droppables.push(e); - }); - } - - // keep reference - this.sortables[element.id] = options; - - // for onupdate - Draggables.addObserver(new SortableObserver(element, options.onUpdate)); - - }, - - // return all suitable-for-sortable elements in a guaranteed order - findElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.tag); - }, - - findTreeElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.treeTag); - }, - - onHover: function(element, dropon, overlap) { - if(Element.isParent(dropon, element)) return; - - if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) { - return; - } else if(overlap>0.5) { - Sortable.mark(dropon, 'before'); - if(dropon.previousSibling != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } else { - Sortable.mark(dropon, 'after'); - var nextElement = dropon.nextSibling || null; - if(nextElement != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } - }, - - onEmptyHover: function(element, dropon, overlap) { - var oldParentNode = element.parentNode; - var droponOptions = Sortable.options(dropon); - - if(!Element.isParent(dropon, element)) { - var index; - - var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); - var child = null; - - if(children) { - var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); - - for (index = 0; index < children.length; index += 1) { - if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { - offset -= Element.offsetSize (children[index], droponOptions.overlap); - } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) { - child = index + 1 < children.length ? children[index + 1] : null; - break; - } else { - child = children[index]; - break; - } - } - } - - dropon.insertBefore(element, child); - - Sortable.options(oldParentNode).onChange(element); - droponOptions.onChange(element); - } - }, - - unmark: function() { - if(Sortable._marker) Sortable._marker.hide(); - }, - - mark: function(dropon, position) { - // mark on ghosting only - var sortable = Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return; - - if(!Sortable._marker) { - Sortable._marker = - ($('dropmarker') || Element.extend(document.createElement('DIV'))). - hide().addClassName('dropmarker').setStyle({position:'absolute'}); - document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); - } - var offsets = Position.cumulativeOffset(dropon); - Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); - - if(position=='after') - if(sortable.overlap == 'horizontal') - Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); - else - Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); - - Sortable._marker.show(); - }, - - _tree: function(element, options, parent) { - var children = Sortable.findElements(element, options) || []; - - for (var i = 0; i < children.length; ++i) { - var match = children[i].id.match(options.format); - - if (!match) continue; - - var child = { - id: encodeURIComponent(match ? match[1] : null), - element: element, - parent: parent, - children: [], - position: parent.children.length, - container: $(children[i]).down(options.treeTag) - } - - /* Get the element containing the children and recurse over it */ - if (child.container) - this._tree(child.container, options, child) - - parent.children.push (child); - } - - return parent; - }, - - tree: function(element) { - element = $(element); - var sortableOptions = this.options(element); - var options = Object.extend({ - tag: sortableOptions.tag, - treeTag: sortableOptions.treeTag, - only: sortableOptions.only, - name: element.id, - format: sortableOptions.format - }, arguments[1] || {}); - - var root = { - id: null, - parent: null, - children: [], - container: element, - position: 0 - } - - return Sortable._tree(element, options, root); - }, - - /* Construct a [i] index for a particular node */ - _constructIndex: function(node) { - var index = ''; - do { - if (node.id) index = '[' + node.position + ']' + index; - } while ((node = node.parent) != null); - return index; - }, - - sequence: function(element) { - element = $(element); - var options = Object.extend(this.options(element), arguments[1] || {}); - - return $(this.findElements(element, options) || []).map( function(item) { - return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; - }); - }, - - setSequence: function(element, new_sequence) { - element = $(element); - var options = Object.extend(this.options(element), arguments[2] || {}); - - var nodeMap = {}; - this.findElements(element, options).each( function(n) { - if (n.id.match(options.format)) - nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; - n.parentNode.removeChild(n); - }); - - new_sequence.each(function(ident) { - var n = nodeMap[ident]; - if (n) { - n[1].appendChild(n[0]); - delete nodeMap[ident]; - } - }); - }, - - serialize: function(element) { - element = $(element); - var options = Object.extend(Sortable.options(element), arguments[1] || {}); - var name = encodeURIComponent( - (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); - - if (options.tree) { - return Sortable.tree(element, arguments[1]).children.map( function (item) { - return [name + Sortable._constructIndex(item) + "[id]=" + - encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); - }).flatten().join('&'); - } else { - return Sortable.sequence(element, arguments[1]).map( function(item) { - return name + "[]=" + encodeURIComponent(item); - }).join('&'); - } - } -} - -// Returns true if child is contained within element -Element.isParent = function(child, element) { - if (!child.parentNode || child == element) return false; - if (child.parentNode == element) return true; - return Element.isParent(child.parentNode, element); -} - -Element.findChildren = function(element, only, recursive, tagName) { - if(!element.hasChildNodes()) return null; - tagName = tagName.toUpperCase(); - if(only) only = [only].flatten(); - var elements = []; - $A(element.childNodes).each( function(e) { - if(e.tagName && e.tagName.toUpperCase()==tagName && - (!only || (Element.classNames(e).detect(function(v) { return only.include(v) })))) - elements.push(e); - if(recursive) { - var grandchildren = Element.findChildren(e, only, recursive, tagName); - if(grandchildren) elements.push(grandchildren); - } - }); - - return (elements.length>0 ? elements.flatten() : []); -} - -Element.offsetSize = function (element, type) { - return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; -} Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,228 +0,0 @@ -function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) { - var options = { - requestHeaders: ["ajax","true"], - method: "post", - postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId, - onSuccess: function(t) - { - }, - on404: function(t) - { - alert("Error 404: location " + t.statusText + " was not found."); - }, - onFailure: function(t) - { - alert("Error " + t.status + " -- " + t.statusText); - }, - onLoading: function(t) - { - } - } - new Ajax.Request(async_server_url, options); -} - -function snapshot() { - - // Find draggable regions - var regions_on_page = document.getElementsByClassName("dyna-region"); - - // Save current state in the DOM itself - for(var i = 0;i < regions_on_page.length;i++) { - var regionDiv = regions_on_page[i] - for (var j = 0;j < regionDiv.childNodes.length;j++) { - var child = regionDiv.childNodes[j]; - child["regionId"] = regionDiv.id; - child["pos"] = j; - } - } -} - -function bilto(event) -{ - - // Locate the div container of the window - var source = Event.element(event); - var container = Element.up(source, "div.dyna-window"); - - // We found the window - if (container != null) { - - - var form = source.nodeName == "FORM"; - var link = !form & source.nodeName == "A"; - - var url; - var body; - var method; - - if (source.nodeName == "A") - { - url = source.href; - method = "get"; - body = ""; - } - else if (source.nodeName == "INPUT" && source.type == "submit") - { - // Find enclosing form - var current = source.parentNode; - while (current.nodeName != 'FORM' && current.nodeName != 'BODY') { - current = current.parentNode; - } - - // Check we have a form and use it - if (current.nodeName == 'FORM') { - - // - url = current.action; - - // Get body if needed - if (current.method.toLowerCase() == "post") { - body = Form.serialize(current); - method = "post"; - } - else - { - body = ""; - method = "get"; - } - } - } - - // Handle links here - if (url != null) { - // - var headers = ["ajax","true"]; - if (view_state !== undefined) - { - headers.view_state = view_state; - } - - // note : we don't convert query string to prototype parameters as in the case - // of a post, the parameters will be appended to the body of the query which - // will lead to a non correct request - - // If we process a form then we will perform a blocking interaction - var asynchronous = !form; - - // - var options = { - asynchronous:asynchronous, - method: method, - postBody: body, - requestHeaders:headers, - onSuccess: function(t) - { - var resp = ""; - eval("resp =" + t.responseText + ";"); - if (resp.type == "update_markup") - { - // Iterate all changes - for (var id in resp.fragments) - { - var matchingElt = document.getElementById(id); - - // Different than 1 is not good - if (matchingElt != null) - { - var markup = resp.fragments[id]; - markup = markup.substring(25, markup.length - 7); - - var markupContainer = Element.up(matchingElt); - markupContainer.innerHTML = markup; - } - } - - // update view state - view_state = resp.view_state; - } - else if (resp.type == "update_page") - { - document.location = resp.location; - } - } - }; - - // Add the form post body - // todo : detect file upload - if (form) - { - options.postBody = Form.serialize(source); - } - - // - Event.stop(event); - new Ajax.Request(url, options); - } - - } - -} - - -function footer() -{ - // - var WindowMoveObserver = Class.create(); - WindowMoveObserver.prototype = - { - initialize: function(element) - { - this.element = $(element); - }, - onStart: function() - { - }, - onEnd: function() - { - var elt = Draggables.activeDraggable.element; - - // - var windowId = Element.down(elt).id; - var fromRegionId = elt["regionId"]; - var fromPos = elt["pos"]; - - // Doing the snapshot after move will give us the new region and pos of the window - snapshot(); - var toRegionId = elt["regionId"]; - var toPos = elt["pos"]; - - // Perform request - sendData("windowmove", windowId, fromPos, fromRegionId, toPos, toRegionId); - } - }; - - // Find the draggable regions - var regions_on_page = document.getElementsByClassName("dyna-region"); - - // Create draggable regions - for(var i = 0;i < regions_on_page.length;i++) { - var region = regions_on_page[i]; - Sortable.create(region, {dropOnEmpty:true,handle:"handle",tag:"div",containment:regions_on_page,constraint:false}); - } - - // - Draggables.addObserver(new WindowMoveObserver()); - snapshot(); - - // Find the dyna portlets - var portlets_on_page = document.getElementsByClassName("dyna-window"); - - // Add listener for the dyna windows - for(var i = 0;i < portlets_on_page.length;i++) { - var portlet = portlets_on_page[i]; - Event.observe(portlet, "click", bilto); - } -} - - -// String u = "" + -// "function removeWindow(elementId)\n" + -// "{\n" + -// " var effectElement = document.getElementById(elementId)\n" + -// " new Effect.BlindUp(effectElement);\n" + -// "\n" + -// " //removeElement(effectElement);\n" + -// "\n" + -// " sendData('windowremove', elementId);\n" + -// "}\n"; -// markup.append(u); Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/effects.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/effects.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/effects.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,1090 +0,0 @@ -// script.aculo.us effects.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// Contributors: -// Justin Palmer (http://encytemedia.com/) -// Mark Pilgrim (http://diveintomark.org/) -// Martin Bialasinki -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -// converts rgb() and #xxx to #xxxxxx format, -// returns self (or first argument) if not convertable -String.prototype.parseColor = function() { - var color = '#'; - if(this.slice(0,4) == 'rgb(') { - var cols = this.slice(4,this.length-1).split(','); - var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); - } else { - if(this.slice(0,1) == '#') { - if(this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); - if(this.length==7) color = this.toLowerCase(); - } - } - return(color.length==7 ? color : (arguments[0] || this)); -} - -/*--------------------------------------------------------------------------*/ - -Element.collectTextNodes = function(element) { - return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); - }).flatten().join(''); -} - -Element.collectTextNodesIgnoreClass = function(element, className) { - return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? - Element.collectTextNodesIgnoreClass(node, className) : '')); - }).flatten().join(''); -} - -Element.setContentZoom = function(element, percent) { - element = $(element); - element.setStyle({fontSize: (percent/100) + 'em'}); - if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); - return element; -} - -Element.getOpacity = function(element){ - return $(element).getStyle('opacity'); -} - -Element.setOpacity = function(element, value){ - return $(element).setStyle({opacity:value}); -} - -Element.getInlineOpacity = function(element){ - return $(element).style.opacity || ''; -} - -Element.forceRerendering = function(element) { - try { - element = $(element); - var n = document.createTextNode(' '); - element.appendChild(n); - element.removeChild(n); - } catch(e) { } -}; - -/*--------------------------------------------------------------------------*/ - -Array.prototype.call = function() { - var args = arguments; - this.each(function(f){ f.apply(this, args) }); -} - -/*--------------------------------------------------------------------------*/ - -var Effect = { - _elementDoesNotExistError: { - name: 'ElementDoesNotExistError', - message: 'The specified DOM element does not exist, but is required for this effect to operate' - }, - tagifyText: function(element) { - if(typeof Builder == 'undefined') - throw("Effect.tagifyText requires including script.aculo.us' builder.js library"); - - var tagifyStyle = 'position:relative'; - if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1'; - - element = $(element); - $A(element.childNodes).each( function(child) { - if(child.nodeType==3) { - child.nodeValue.toArray().each( function(character) { - element.insertBefore( - Builder.node('span',{style: tagifyStyle}, - character == ' ' ? String.fromCharCode(160) : character), - child); - }); - Element.remove(child); - } - }); - }, - multiple: function(element, effect) { - var elements; - if(((typeof element == 'object') || - (typeof element == 'function')) && - (element.length)) - elements = element; - else - elements = $(element).childNodes; - - var options = Object.extend({ - speed: 0.1, - delay: 0.0 - }, arguments[2] || {}); - var masterDelay = options.delay; - - $A(elements).each( function(element, index) { - new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay })); - }); - }, - PAIRS: { - 'slide': ['SlideDown','SlideUp'], - 'blind': ['BlindDown','BlindUp'], - 'appear': ['Appear','Fade'] - }, - toggle: function(element, effect) { - element = $(element); - effect = (effect || 'appear').toLowerCase(); - var options = Object.extend({ - queue: { position:'end', scope:(element.id || 'global'), limit: 1 } - }, arguments[2] || {}); - Effect[element.visible() ? - Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); - } -}; - -var Effect2 = Effect; // deprecated - -/* ------------- transitions ------------- */ - -Effect.Transitions = { - linear: Prototype.K, - sinoidal: function(pos) { - return (-Math.cos(pos*Math.PI)/2) + 0.5; - }, - reverse: function(pos) { - return 1-pos; - }, - flicker: function(pos) { - return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4; - }, - wobble: function(pos) { - return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5; - }, - pulse: function(pos, pulses) { - pulses = pulses || 5; - return ( - Math.round((pos % (1/pulses)) * pulses) == 0 ? - ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) : - 1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) - ); - }, - none: function(pos) { - return 0; - }, - full: function(pos) { - return 1; - } -}; - -/* ------------- core effects ------------- */ - -Effect.ScopedQueue = Class.create(); -Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), { - initialize: function() { - this.effects = []; - this.interval = null; - }, - _each: function(iterator) { - this.effects._each(iterator); - }, - add: function(effect) { - var timestamp = new Date().getTime(); - - var position = (typeof effect.options.queue == 'string') ? - effect.options.queue : effect.options.queue.position; - - switch(position) { - case 'front': - // move unstarted effects after this effect - this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { - e.startOn += effect.finishOn; - e.finishOn += effect.finishOn; - }); - break; - case 'with-last': - timestamp = this.effects.pluck('startOn').max() || timestamp; - break; - case 'end': - // start effect after last queued effect has finished - timestamp = this.effects.pluck('finishOn').max() || timestamp; - break; - } - - effect.startOn += timestamp; - effect.finishOn += timestamp; - - if(!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) - this.effects.push(effect); - - if(!this.interval) - this.interval = setInterval(this.loop.bind(this), 15); - }, - remove: function(effect) { - this.effects = this.effects.reject(function(e) { return e==effect }); - if(this.effects.length == 0) { - clearInterval(this.interval); - this.interval = null; - } - }, - loop: function() { - var timePos = new Date().getTime(); - for(var i=0, len=this.effects.length;i<len;i++) - if(this.effects[i]) this.effects[i].loop(timePos); - } -}); - -Effect.Queues = { - instances: $H(), - get: function(queueName) { - if(typeof queueName != 'string') return queueName; - - if(!this.instances[queueName]) - this.instances[queueName] = new Effect.ScopedQueue(); - - return this.instances[queueName]; - } -} -Effect.Queue = Effect.Queues.get('global'); - -Effect.DefaultOptions = { - transition: Effect.Transitions.sinoidal, - duration: 1.0, // seconds - fps: 60.0, // max. 60fps due to Effect.Queue implementation - sync: false, // true for combining - from: 0.0, - to: 1.0, - delay: 0.0, - queue: 'parallel' -} - -Effect.Base = function() {}; -Effect.Base.prototype = { - position: null, - start: function(options) { - this.options = Object.extend(Object.extend({},Effect.DefaultOptions), options || {}); - this.currentFrame = 0; - this.state = 'idle'; - this.startOn = this.options.delay*1000; - this.finishOn = this.startOn + (this.options.duration*1000); - this.event('beforeStart'); - if(!this.options.sync) - Effect.Queues.get(typeof this.options.queue == 'string' ? - 'global' : this.options.queue.scope).add(this); - }, - loop: function(timePos) { - if(timePos >= this.startOn) { - if(timePos >= this.finishOn) { - this.render(1.0); - this.cancel(); - this.event('beforeFinish'); - if(this.finish) this.finish(); - this.event('afterFinish'); - return; - } - var pos = (timePos - this.startOn) / (this.finishOn - this.startOn); - var frame = Math.round(pos * this.options.fps * this.options.duration); - if(frame > this.currentFrame) { - this.render(pos); - this.currentFrame = frame; - } - } - }, - render: function(pos) { - if(this.state == 'idle') { - this.state = 'running'; - this.event('beforeSetup'); - if(this.setup) this.setup(); - this.event('afterSetup'); - } - if(this.state == 'running') { - if(this.options.transition) pos = this.options.transition(pos); - pos *= (this.options.to-this.options.from); - pos += this.options.from; - this.position = pos; - this.event('beforeUpdate'); - if(this.update) this.update(pos); - this.event('afterUpdate'); - } - }, - cancel: function() { - if(!this.options.sync) - Effect.Queues.get(typeof this.options.queue == 'string' ? - 'global' : this.options.queue.scope).remove(this); - this.state = 'finished'; - }, - event: function(eventName) { - if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this); - if(this.options[eventName]) this.options[eventName](this); - }, - inspect: function() { - var data = $H(); - for(property in this) - if(typeof this[property] != 'function') data[property] = this[property]; - return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>'; - } -} - -Effect.Parallel = Class.create(); -Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), { - initialize: function(effects) { - this.effects = effects || []; - this.start(arguments[1]); - }, - update: function(position) { - this.effects.invoke('render', position); - }, - finish: function(position) { - this.effects.each( function(effect) { - effect.render(1.0); - effect.cancel(); - effect.event('beforeFinish'); - if(effect.finish) effect.finish(position); - effect.event('afterFinish'); - }); - } -}); - -Effect.Event = Class.create(); -Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), { - initialize: function() { - var options = Object.extend({ - duration: 0 - }, arguments[0] || {}); - this.start(options); - }, - update: Prototype.emptyFunction -}); - -Effect.Opacity = Class.create(); -Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), { - initialize: function(element) { - this.element = $(element); - if(!this.element) throw(Effect._elementDoesNotExistError); - // make this work on IE on elements without 'layout' - if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout)) - this.element.setStyle({zoom: 1}); - var options = Object.extend({ - from: this.element.getOpacity() || 0.0, - to: 1.0 - }, arguments[1] || {}); - this.start(options); - }, - update: function(position) { - this.element.setOpacity(position); - } -}); - -Effect.Move = Class.create(); -Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), { - initialize: function(element) { - this.element = $(element); - if(!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - x: 0, - y: 0, - mode: 'relative' - }, arguments[1] || {}); - this.start(options); - }, - setup: function() { - // Bug in Opera: Opera returns the "real" position of a static element or - // relative element that does not have top/left explicitly set. - // ==> Always set top and left for position relative elements in your stylesheets - // (to 0 if you do not need them) - this.element.makePositioned(); - this.originalLeft = parseFloat(this.element.getStyle('left') || '0'); - this.originalTop = parseFloat(this.element.getStyle('top') || '0'); - if(this.options.mode == 'absolute') { - // absolute movement, so we need to calc deltaX and deltaY - this.options.x = this.options.x - this.originalLeft; - this.options.y = this.options.y - this.originalTop; - } - }, - update: function(position) { - this.element.setStyle({ - left: Math.round(this.options.x * position + this.originalLeft) + 'px', - top: Math.round(this.options.y * position + this.originalTop) + 'px' - }); - } -}); - -// for backwards compatibility -Effect.MoveBy = function(element, toTop, toLeft) { - return new Effect.Move(element, - Object.extend({ x: toLeft, y: toTop }, arguments[3] || {})); -}; - -Effect.Scale = Class.create(); -Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), { - initialize: function(element, percent) { - this.element = $(element); - if(!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - scaleX: true, - scaleY: true, - scaleContent: true, - scaleFromCenter: false, - scaleMode: 'box', // 'box' or 'contents' or {} with provided values - scaleFrom: 100.0, - scaleTo: percent - }, arguments[2] || {}); - this.start(options); - }, - setup: function() { - this.restoreAfterFinish = this.options.restoreAfterFinish || false; - this.elementPositioning = this.element.getStyle('position'); - - this.originalStyle = {}; - ['top','left','width','height','fontSize'].each( function(k) { - this.originalStyle[k] = this.element.style[k]; - }.bind(this)); - - this.originalTop = this.element.offsetTop; - this.originalLeft = this.element.offsetLeft; - - var fontSize = this.element.getStyle('font-size') || '100%'; - ['em','px','%','pt'].each( function(fontSizeType) { - if(fontSize.indexOf(fontSizeType)>0) { - this.fontSize = parseFloat(fontSize); - this.fontSizeType = fontSizeType; - } - }.bind(this)); - - this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; - - this.dims = null; - if(this.options.scaleMode=='box') - this.dims = [this.element.offsetHeight, this.element.offsetWidth]; - if(/^content/.test(this.options.scaleMode)) - this.dims = [this.element.scrollHeight, this.element.scrollWidth]; - if(!this.dims) - this.dims = [this.options.scaleMode.originalHeight, - this.options.scaleMode.originalWidth]; - }, - update: function(position) { - var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position); - if(this.options.scaleContent && this.fontSize) - this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType }); - this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale); - }, - finish: function(position) { - if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle); - }, - setDimensions: function(height, width) { - var d = {}; - if(this.options.scaleX) d.width = Math.round(width) + 'px'; - if(this.options.scaleY) d.height = Math.round(height) + 'px'; - if(this.options.scaleFromCenter) { - var topd = (height - this.dims[0])/2; - var leftd = (width - this.dims[1])/2; - if(this.elementPositioning == 'absolute') { - if(this.options.scaleY) d.top = this.originalTop-topd + 'px'; - if(this.options.scaleX) d.left = this.originalLeft-leftd + 'px'; - } else { - if(this.options.scaleY) d.top = -topd + 'px'; - if(this.options.scaleX) d.left = -leftd + 'px'; - } - } - this.element.setStyle(d); - } -}); - -Effect.Highlight = Class.create(); -Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), { - initialize: function(element) { - this.element = $(element); - if(!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {}); - this.start(options); - }, - setup: function() { - // Prevent executing on elements not in the layout flow - if(this.element.getStyle('display')=='none') { this.cancel(); return; } - // Disable background image during the effect - this.oldStyle = {}; - if (!this.options.keepBackgroundImage) { - this.oldStyle.backgroundImage = this.element.getStyle('background-image'); - this.element.setStyle({backgroundImage: 'none'}); - } - if(!this.options.endcolor) - this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff'); - if(!this.options.restorecolor) - this.options.restorecolor = this.element.getStyle('background-color'); - // init color calculations - this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this)); - this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this)); - }, - update: function(position) { - this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){ - return m+(Math.round(this._base[i]+(this._delta[i]*position)).toColorPart()); }.bind(this)) }); - }, - finish: function() { - this.element.setStyle(Object.extend(this.oldStyle, { - backgroundColor: this.options.restorecolor - })); - } -}); - -Effect.ScrollTo = Class.create(); -Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), { - initialize: function(element) { - this.element = $(element); - this.start(arguments[1] || {}); - }, - setup: function() { - Position.prepare(); - var offsets = Position.cumulativeOffset(this.element); - if(this.options.offset) offsets[1] += this.options.offset; - var max = window.innerHeight ? - window.height - window.innerHeight : - document.body.scrollHeight - - (document.documentElement.clientHeight ? - document.documentElement.clientHeight : document.body.clientHeight); - this.scrollStart = Position.deltaY; - this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart; - }, - update: function(position) { - Position.prepare(); - window.scrollTo(Position.deltaX, - this.scrollStart + (position*this.delta)); - } -}); - -/* ------------- combination effects ------------- */ - -Effect.Fade = function(element) { - element = $(element); - var oldOpacity = element.getInlineOpacity(); - var options = Object.extend({ - from: element.getOpacity() || 1.0, - to: 0.0, - afterFinishInternal: function(effect) { - if(effect.options.to!=0) return; - effect.element.hide().setStyle({opacity: oldOpacity}); - }}, arguments[1] || {}); - return new Effect.Opacity(element,options); -} - -Effect.Appear = function(element) { - element = $(element); - var options = Object.extend({ - from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), - to: 1.0, - // force Safari to render floated elements properly - afterFinishInternal: function(effect) { - effect.element.forceRerendering(); - }, - beforeSetup: function(effect) { - effect.element.setOpacity(effect.options.from).show(); - }}, arguments[1] || {}); - return new Effect.Opacity(element,options); -} - -Effect.Puff = function(element) { - element = $(element); - var oldStyle = { - opacity: element.getInlineOpacity(), - position: element.getStyle('position'), - top: element.style.top, - left: element.style.left, - width: element.style.width, - height: element.style.height - }; - return new Effect.Parallel( - [ new Effect.Scale(element, 200, - { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], - Object.extend({ duration: 1.0, - beforeSetupInternal: function(effect) { - Position.absolutize(effect.effects[0].element) - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().setStyle(oldStyle); } - }, arguments[1] || {}) - ); -} - -Effect.BlindUp = function(element) { - element = $(element); - element.makeClipping(); - return new Effect.Scale(element, 0, - Object.extend({ scaleContent: false, - scaleX: false, - restoreAfterFinish: true, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); - } - }, arguments[1] || {}) - ); -} - -Effect.BlindDown = function(element) { - element = $(element); - var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, - scaleFrom: 0, - scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, - restoreAfterFinish: true, - afterSetup: function(effect) { - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, - afterFinishInternal: function(effect) { - effect.element.undoClipping(); - } - }, arguments[1] || {})); -} - -Effect.SwitchOff = function(element) { - element = $(element); - var oldOpacity = element.getInlineOpacity(); - return new Effect.Appear(element, Object.extend({ - duration: 0.4, - from: 0, - transition: Effect.Transitions.flicker, - afterFinishInternal: function(effect) { - new Effect.Scale(effect.element, 1, { - duration: 0.3, scaleFromCenter: true, - scaleX: false, scaleContent: false, restoreAfterFinish: true, - beforeSetup: function(effect) { - effect.element.makePositioned().makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); - } - }) - } - }, arguments[1] || {})); -} - -Effect.DropOut = function(element) { - element = $(element); - var oldStyle = { - top: element.getStyle('top'), - left: element.getStyle('left'), - opacity: element.getInlineOpacity() }; - return new Effect.Parallel( - [ new Effect.Move(element, {x: 0, y: 100, sync: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 }) ], - Object.extend( - { duration: 0.5, - beforeSetup: function(effect) { - effect.effects[0].element.makePositioned(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); - } - }, arguments[1] || {})); -} - -Effect.Shake = function(element) { - element = $(element); - var oldStyle = { - top: element.getStyle('top'), - left: element.getStyle('left') }; - return new Effect.Move(element, - { x: 20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { - effect.element.undoPositioned().setStyle(oldStyle); - }}) }}) }}) }}) }}) }}); -} - -Effect.SlideDown = function(element) { - element = $(element).cleanWhitespace(); - // SlideDown need to have the content of the element wrapped in a container element with fixed height! - var oldInnerBottom = element.down().getStyle('bottom'); - var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, - scaleFrom: window.opera ? 0 : 1, - scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, - restoreAfterFinish: true, - afterSetup: function(effect) { - effect.element.makePositioned(); - effect.element.down().makePositioned(); - if(window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, - afterUpdateInternal: function(effect) { - effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); - }, - afterFinishInternal: function(effect) { - effect.element.undoClipping().undoPositioned(); - effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); } - }, arguments[1] || {}) - ); -} - -Effect.SlideUp = function(element) { - element = $(element).cleanWhitespace(); - var oldInnerBottom = element.down().getStyle('bottom'); - return new Effect.Scale(element, window.opera ? 0 : 1, - Object.extend({ scaleContent: false, - scaleX: false, - scaleMode: 'box', - scaleFrom: 100, - restoreAfterFinish: true, - beforeStartInternal: function(effect) { - effect.element.makePositioned(); - effect.element.down().makePositioned(); - if(window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().show(); - }, - afterUpdateInternal: function(effect) { - effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom}); - effect.element.down().undoPositioned(); - } - }, arguments[1] || {}) - ); -} - -// Bug in opera makes the TD containing this element expand for a instance after finish -Effect.Squish = function(element) { - return new Effect.Scale(element, window.opera ? 1 : 0, { - restoreAfterFinish: true, - beforeSetup: function(effect) { - effect.element.makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); - } - }); -} - -Effect.Grow = function(element) { - element = $(element); - var options = Object.extend({ - direction: 'center', - moveTransition: Effect.Transitions.sinoidal, - scaleTransition: Effect.Transitions.sinoidal, - opacityTransition: Effect.Transitions.full - }, arguments[1] || {}); - var oldStyle = { - top: element.style.top, - left: element.style.left, - height: element.style.height, - width: element.style.width, - opacity: element.getInlineOpacity() }; - - var dims = element.getDimensions(); - var initialMoveX, initialMoveY; - var moveX, moveY; - - switch (options.direction) { - case 'top-left': - initialMoveX = initialMoveY = moveX = moveY = 0; - break; - case 'top-right': - initialMoveX = dims.width; - initialMoveY = moveY = 0; - moveX = -dims.width; - break; - case 'bottom-left': - initialMoveX = moveX = 0; - initialMoveY = dims.height; - moveY = -dims.height; - break; - case 'bottom-right': - initialMoveX = dims.width; - initialMoveY = dims.height; - moveX = -dims.width; - moveY = -dims.height; - break; - case 'center': - initialMoveX = dims.width / 2; - initialMoveY = dims.height / 2; - moveX = -dims.width / 2; - moveY = -dims.height / 2; - break; - } - - return new Effect.Move(element, { - x: initialMoveX, - y: initialMoveY, - duration: 0.01, - beforeSetup: function(effect) { - effect.element.hide().makeClipping().makePositioned(); - }, - afterFinishInternal: function(effect) { - new Effect.Parallel( - [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), - new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), - new Effect.Scale(effect.element, 100, { - scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, - sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) - ], Object.extend({ - beforeSetup: function(effect) { - effect.effects[0].element.setStyle({height: '0px'}).show(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); - } - }, options) - ) - } - }); -} - -Effect.Shrink = function(element) { - element = $(element); - var options = Object.extend({ - direction: 'center', - moveTransition: Effect.Transitions.sinoidal, - scaleTransition: Effect.Transitions.sinoidal, - opacityTransition: Effect.Transitions.none - }, arguments[1] || {}); - var oldStyle = { - top: element.style.top, - left: element.style.left, - height: element.style.height, - width: element.style.width, - opacity: element.getInlineOpacity() }; - - var dims = element.getDimensions(); - var moveX, moveY; - - switch (options.direction) { - case 'top-left': - moveX = moveY = 0; - break; - case 'top-right': - moveX = dims.width; - moveY = 0; - break; - case 'bottom-left': - moveX = 0; - moveY = dims.height; - break; - case 'bottom-right': - moveX = dims.width; - moveY = dims.height; - break; - case 'center': - moveX = dims.width / 2; - moveY = dims.height / 2; - break; - } - - return new Effect.Parallel( - [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), - new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), - new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) - ], Object.extend({ - beforeStartInternal: function(effect) { - effect.effects[0].element.makePositioned().makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } - }, options) - ); -} - -Effect.Pulsate = function(element) { - element = $(element); - var options = arguments[1] || {}; - var oldOpacity = element.getInlineOpacity(); - var transition = options.transition || Effect.Transitions.sinoidal; - var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; - reverser.bind(transition); - return new Effect.Opacity(element, - Object.extend(Object.extend({ duration: 2.0, from: 0, - afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } - }, options), {transition: reverser})); -} - -Effect.Fold = function(element) { - element = $(element); - var oldStyle = { - top: element.style.top, - left: element.style.left, - width: element.style.width, - height: element.style.height }; - element.makeClipping(); - return new Effect.Scale(element, 5, Object.extend({ - scaleContent: false, - scaleX: false, - afterFinishInternal: function(effect) { - new Effect.Scale(element, 1, { - scaleContent: false, - scaleY: false, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().setStyle(oldStyle); - } }); - }}, arguments[1] || {})); -}; - -Effect.Morph = Class.create(); -Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), { - initialize: function(element) { - this.element = $(element); - if(!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - style: {} - }, arguments[1] || {}); - if (typeof options.style == 'string') { - if(options.style.indexOf(':') == -1) { - var cssText = '', selector = '.' + options.style; - $A(document.styleSheets).reverse().each(function(styleSheet) { - if (styleSheet.cssRules) cssRules = styleSheet.cssRules; - else if (styleSheet.rules) cssRules = styleSheet.rules; - $A(cssRules).reverse().each(function(rule) { - if (selector == rule.selectorText) { - cssText = rule.style.cssText; - throw $break; - } - }); - if (cssText) throw $break; - }); - this.style = cssText.parseStyle(); - options.afterFinishInternal = function(effect){ - effect.element.addClassName(effect.options.style); - effect.transforms.each(function(transform) { - if(transform.style != 'opacity') - effect.element.style[transform.style.camelize()] = ''; - }); - } - } else this.style = options.style.parseStyle(); - } else this.style = $H(options.style) - this.start(options); - }, - setup: function(){ - function parseColor(color){ - if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; - color = color.parseColor(); - return $R(0,2).map(function(i){ - return parseInt( color.slice(i*2+1,i*2+3), 16 ) - }); - } - this.transforms = this.style.map(function(pair){ - var property = pair[0].underscore().dasherize(), value = pair[1], unit = null; - - if(value.parseColor('#zzzzzz') != '#zzzzzz') { - value = value.parseColor(); - unit = 'color'; - } else if(property == 'opacity') { - value = parseFloat(value); - if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout)) - this.element.setStyle({zoom: 1}); - } else if(Element.CSS_LENGTH.test(value)) - var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/), - value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null; - - var originalValue = this.element.getStyle(property); - return $H({ - style: property, - originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), - targetValue: unit=='color' ? parseColor(value) : value, - unit: unit - }); - }.bind(this)).reject(function(transform){ - return ( - (transform.originalValue == transform.targetValue) || - ( - transform.unit != 'color' && - (isNaN(transform.originalValue) || isNaN(transform.targetValue)) - ) - ) - }); - }, - update: function(position) { - var style = $H(), value = null; - this.transforms.each(function(transform){ - value = transform.unit=='color' ? - $R(0,2).inject('#',function(m,v,i){ - return m+(Math.round(transform.originalValue[i]+ - (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) : - transform.originalValue + Math.round( - ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit; - style[transform.style] = value; - }); - this.element.setStyle(style); - } -}); - -Effect.Transform = Class.create(); -Object.extend(Effect.Transform.prototype, { - initialize: function(tracks){ - this.tracks = []; - this.options = arguments[1] || {}; - this.addTracks(tracks); - }, - addTracks: function(tracks){ - tracks.each(function(track){ - var data = $H(track).values().first(); - this.tracks.push($H({ - ids: $H(track).keys().first(), - effect: Effect.Morph, - options: { style: data } - })); - }.bind(this)); - return this; - }, - play: function(){ - return new Effect.Parallel( - this.tracks.map(function(track){ - var elements = [$(track.ids) || $$(track.ids)].flatten(); - return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) }); - }).flatten(), - this.options - ); - } -}); - -Element.CSS_PROPERTIES = $w( - 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + - 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + - 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + - 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + - 'fontSize fontWeight height left letterSpacing lineHeight ' + - 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+ - 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + - 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + - 'right textIndent top width wordSpacing zIndex'); - -Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; - -String.prototype.parseStyle = function(){ - var element = Element.extend(document.createElement('div')); - element.innerHTML = '<div style="' + this + '"></div>'; - var style = element.down().style, styleRules = $H(); - - Element.CSS_PROPERTIES.each(function(property){ - if(style[property]) styleRules[property] = style[property]; - }); - if(/MSIE/.test(navigator.userAgent) && !window.opera && this.indexOf('opacity') > -1) { - styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]; - } - return styleRules; -}; - -Element.morph = function(element, style) { - new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {})); - return element; -}; - -['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom', - 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each( - function(f) { Element.Methods[f] = Element[f]; } -); - -Element.Methods.visualEffect = function(element, effect, options) { - s = effect.gsub(/_/, '-').camelize(); - effect_class = s.charAt(0).toUpperCase() + s.substring(1); - new Effect[effect_class](element, options); - return $(element); -}; - -Element.addMethods(); \ No newline at end of file Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/prototype.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/prototype.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/prototype.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,2515 +0,0 @@ -/* Prototype JavaScript framework, version 1.5.0 - * (c) 2005-2007 Sam Stephenson - * - * Prototype is freely distributable under the terms of an MIT-style license. - * For details, see the Prototype web site: http://prototype.conio.net/ - * -/*--------------------------------------------------------------------------*/ - -var Prototype = { - Version: '1.5.0', - BrowserFeatures: { - XPath: !!document.evaluate - }, - - ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)', - emptyFunction: function() {}, - K: function(x) { return x } -} - -var Class = { - create: function() { - return function() { - this.initialize.apply(this, arguments); - } - } -} - -var Abstract = new Object(); - -Object.extend = function(destination, source) { - for (var property in source) { - destination[property] = source[property]; - } - return destination; -} - -Object.extend(Object, { - inspect: function(object) { - try { - if (object === undefined) return 'undefined'; - if (object === null) return 'null'; - return object.inspect ? object.inspect() : object.toString(); - } catch (e) { - if (e instanceof RangeError) return '...'; - throw e; - } - }, - - keys: function(object) { - var keys = []; - for (var property in object) - keys.push(property); - return keys; - }, - - values: function(object) { - var values = []; - for (var property in object) - values.push(object[property]); - return values; - }, - - clone: function(object) { - return Object.extend({}, object); - } -}); - -Function.prototype.bind = function() { - var __method = this, args = $A(arguments), object = args.shift(); - return function() { - return __method.apply(object, args.concat($A(arguments))); - } -} - -Function.prototype.bindAsEventListener = function(object) { - var __method = this, args = $A(arguments), object = args.shift(); - return function(event) { - return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments))); - } -} - -Object.extend(Number.prototype, { - toColorPart: function() { - var digits = this.toString(16); - if (this < 16) return '0' + digits; - return digits; - }, - - succ: function() { - return this + 1; - }, - - times: function(iterator) { - $R(0, this, true).each(iterator); - return this; - } -}); - -var Try = { - these: function() { - var returnValue; - - for (var i = 0, length = arguments.length; i < length; i++) { - var lambda = arguments[i]; - try { - returnValue = lambda(); - break; - } catch (e) {} - } - - return returnValue; - } -} - -/*--------------------------------------------------------------------------*/ - -var PeriodicalExecuter = Class.create(); -PeriodicalExecuter.prototype = { - initialize: function(callback, frequency) { - this.callback = callback; - this.frequency = frequency; - this.currentlyExecuting = false; - - this.registerCallback(); - }, - - registerCallback: function() { - this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - stop: function() { - if (!this.timer) return; - clearInterval(this.timer); - this.timer = null; - }, - - onTimerEvent: function() { - if (!this.currentlyExecuting) { - try { - this.currentlyExecuting = true; - this.callback(this); - } finally { - this.currentlyExecuting = false; - } - } - } -} -String.interpret = function(value){ - return value == null ? '' : String(value); -} - -Object.extend(String.prototype, { - gsub: function(pattern, replacement) { - var result = '', source = this, match; - replacement = arguments.callee.prepareReplacement(replacement); - - while (source.length > 0) { - if (match = source.match(pattern)) { - result += source.slice(0, match.index); - result += String.interpret(replacement(match)); - source = source.slice(match.index + match[0].length); - } else { - result += source, source = ''; - } - } - return result; - }, - - sub: function(pattern, replacement, count) { - replacement = this.gsub.prepareReplacement(replacement); - count = count === undefined ? 1 : count; - - return this.gsub(pattern, function(match) { - if (--count < 0) return match[0]; - return replacement(match); - }); - }, - - scan: function(pattern, iterator) { - this.gsub(pattern, iterator); - return this; - }, - - truncate: function(length, truncation) { - length = length || 30; - truncation = truncation === undefined ? '...' : truncation; - return this.length > length ? - this.slice(0, length - truncation.length) + truncation : this; - }, - - strip: function() { - return this.replace(/^\s+/, '').replace(/\s+$/, ''); - }, - - stripTags: function() { - return this.replace(/<\/?[^>]+>/gi, ''); - }, - - stripScripts: function() { - return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); - }, - - extractScripts: function() { - var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); - var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); - return (this.match(matchAll) || []).map(function(scriptTag) { - return (scriptTag.match(matchOne) || ['', ''])[1]; - }); - }, - - evalScripts: function() { - return this.extractScripts().map(function(script) { return eval(script) }); - }, - - escapeHTML: function() { - var div = document.createElement('div'); - var text = document.createTextNode(this); - div.appendChild(text); - return div.innerHTML; - }, - - unescapeHTML: function() { - var div = document.createElement('div'); - div.innerHTML = this.stripTags(); - return div.childNodes[0] ? (div.childNodes.length > 1 ? - $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) : - div.childNodes[0].nodeValue) : ''; - }, - - toQueryParams: function(separator) { - var match = this.strip().match(/([^?#]*)(#.*)?$/); - if (!match) return {}; - - return match[1].split(separator || '&').inject({}, function(hash, pair) { - if ((pair = pair.split('='))[0]) { - var name = decodeURIComponent(pair[0]); - var value = pair[1] ? decodeURIComponent(pair[1]) : undefined; - - if (hash[name] !== undefined) { - if (hash[name].constructor != Array) - hash[name] = [hash[name]]; - if (value) hash[name].push(value); - } - else hash[name] = value; - } - return hash; - }); - }, - - toArray: function() { - return this.split(''); - }, - - succ: function() { - return this.slice(0, this.length - 1) + - String.fromCharCode(this.charCodeAt(this.length - 1) + 1); - }, - - camelize: function() { - var parts = this.split('-'), len = parts.length; - if (len == 1) return parts[0]; - - var camelized = this.charAt(0) == '-' - ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1) - : parts[0]; - - for (var i = 1; i < len; i++) - camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1); - - return camelized; - }, - - capitalize: function(){ - return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase(); - }, - - underscore: function() { - return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase(); - }, - - dasherize: function() { - return this.gsub(/_/,'-'); - }, - - inspect: function(useDoubleQuotes) { - var escapedString = this.replace(/\\/g, '\\\\'); - if (useDoubleQuotes) - return '"' + escapedString.replace(/"/g, '\\"') + '"'; - else - return "'" + escapedString.replace(/'/g, '\\\'') + "'"; - } -}); - -String.prototype.gsub.prepareReplacement = function(replacement) { - if (typeof replacement == 'function') return replacement; - var template = new Template(replacement); - return function(match) { return template.evaluate(match) }; -} - -String.prototype.parseQuery = String.prototype.toQueryParams; - -var Template = Class.create(); -Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; -Template.prototype = { - initialize: function(template, pattern) { - this.template = template.toString(); - this.pattern = pattern || Template.Pattern; - }, - - evaluate: function(object) { - return this.template.gsub(this.pattern, function(match) { - var before = match[1]; - if (before == '\\') return match[2]; - return before + String.interpret(object[match[3]]); - }); - } -} - -var $break = new Object(); -var $continue = new Object(); - -var Enumerable = { - each: function(iterator) { - var index = 0; - try { - this._each(function(value) { - try { - iterator(value, index++); - } catch (e) { - if (e != $continue) throw e; - } - }); - } catch (e) { - if (e != $break) throw e; - } - return this; - }, - - eachSlice: function(number, iterator) { - var index = -number, slices = [], array = this.toArray(); - while ((index += number) < array.length) - slices.push(array.slice(index, index+number)); - return slices.map(iterator); - }, - - all: function(iterator) { - var result = true; - this.each(function(value, index) { - result = result && !!(iterator || Prototype.K)(value, index); - if (!result) throw $break; - }); - return result; - }, - - any: function(iterator) { - var result = false; - this.each(function(value, index) { - if (result = !!(iterator || Prototype.K)(value, index)) - throw $break; - }); - return result; - }, - - collect: function(iterator) { - var results = []; - this.each(function(value, index) { - results.push((iterator || Prototype.K)(value, index)); - }); - return results; - }, - - detect: function(iterator) { - var result; - this.each(function(value, index) { - if (iterator(value, index)) { - result = value; - throw $break; - } - }); - return result; - }, - - findAll: function(iterator) { - var results = []; - this.each(function(value, index) { - if (iterator(value, index)) - results.push(value); - }); - return results; - }, - - grep: function(pattern, iterator) { - var results = []; - this.each(function(value, index) { - var stringValue = value.toString(); - if (stringValue.match(pattern)) - results.push((iterator || Prototype.K)(value, index)); - }) - return results; - }, - - include: function(object) { - var found = false; - this.each(function(value) { - if (value == object) { - found = true; - throw $break; - } - }); - return found; - }, - - inGroupsOf: function(number, fillWith) { - fillWith = fillWith === undefined ? null : fillWith; - return this.eachSlice(number, function(slice) { - while(slice.length < number) slice.push(fillWith); - return slice; - }); - }, - - inject: function(memo, iterator) { - this.each(function(value, index) { - memo = iterator(memo, value, index); - }); - return memo; - }, - - invoke: function(method) { - var args = $A(arguments).slice(1); - return this.map(function(value) { - return value[method].apply(value, args); - }); - }, - - max: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (result == undefined || value >= result) - result = value; - }); - return result; - }, - - min: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (result == undefined || value < result) - result = value; - }); - return result; - }, - - partition: function(iterator) { - var trues = [], falses = []; - this.each(function(value, index) { - ((iterator || Prototype.K)(value, index) ? - trues : falses).push(value); - }); - return [trues, falses]; - }, - - pluck: function(property) { - var results = []; - this.each(function(value, index) { - results.push(value[property]); - }); - return results; - }, - - reject: function(iterator) { - var results = []; - this.each(function(value, index) { - if (!iterator(value, index)) - results.push(value); - }); - return results; - }, - - sortBy: function(iterator) { - return this.map(function(value, index) { - return {value: value, criteria: iterator(value, index)}; - }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; - }).pluck('value'); - }, - - toArray: function() { - return this.map(); - }, - - zip: function() { - var iterator = Prototype.K, args = $A(arguments); - if (typeof args.last() == 'function') - iterator = args.pop(); - - var collections = [this].concat(args).map($A); - return this.map(function(value, index) { - return iterator(collections.pluck(index)); - }); - }, - - size: function() { - return this.toArray().length; - }, - - inspect: function() { - return '#<Enumerable:' + this.toArray().inspect() + '>'; - } -} - -Object.extend(Enumerable, { - map: Enumerable.collect, - find: Enumerable.detect, - select: Enumerable.findAll, - member: Enumerable.include, - entries: Enumerable.toArray -}); -var $A = Array.from = function(iterable) { - if (!iterable) return []; - if (iterable.toArray) { - return iterable.toArray(); - } else { - var results = []; - for (var i = 0, length = iterable.length; i < length; i++) - results.push(iterable[i]); - return results; - } -} - -Object.extend(Array.prototype, Enumerable); - -if (!Array.prototype._reverse) - Array.prototype._reverse = Array.prototype.reverse; - -Object.extend(Array.prototype, { - _each: function(iterator) { - for (var i = 0, length = this.length; i < length; i++) - iterator(this[i]); - }, - - clear: function() { - this.length = 0; - return this; - }, - - first: function() { - return this[0]; - }, - - last: function() { - return this[this.length - 1]; - }, - - compact: function() { - return this.select(function(value) { - return value != null; - }); - }, - - flatten: function() { - return this.inject([], function(array, value) { - return array.concat(value && value.constructor == Array ? - value.flatten() : [value]); - }); - }, - - without: function() { - var values = $A(arguments); - return this.select(function(value) { - return !values.include(value); - }); - }, - - indexOf: function(object) { - for (var i = 0, length = this.length; i < length; i++) - if (this[i] == object) return i; - return -1; - }, - - reverse: function(inline) { - return (inline !== false ? this : this.toArray())._reverse(); - }, - - reduce: function() { - return this.length > 1 ? this : this[0]; - }, - - uniq: function() { - return this.inject([], function(array, value) { - return array.include(value) ? array : array.concat([value]); - }); - }, - - clone: function() { - return [].concat(this); - }, - - size: function() { - return this.length; - }, - - inspect: function() { - return '[' + this.map(Object.inspect).join(', ') + ']'; - } -}); - -Array.prototype.toArray = Array.prototype.clone; - -function $w(string){ - string = string.strip(); - return string ? string.split(/\s+/) : []; -} - -if(window.opera){ - Array.prototype.concat = function(){ - var array = []; - for(var i = 0, length = this.length; i < length; i++) array.push(this[i]); - for(var i = 0, length = arguments.length; i < length; i++) { - if(arguments[i].constructor == Array) { - for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++) - array.push(arguments[i][j]); - } else { - array.push(arguments[i]); - } - } - return array; - } -} -var Hash = function(obj) { - Object.extend(this, obj || {}); -}; - -Object.extend(Hash, { - toQueryString: function(obj) { - var parts = []; - - this.prototype._each.call(obj, function(pair) { - if (!pair.key) return; - - if (pair.value && pair.value.constructor == Array) { - var values = pair.value.compact(); - if (values.length < 2) pair.value = values.reduce(); - else { - key = encodeURIComponent(pair.key); - values.each(function(value) { - value = value != undefined ? encodeURIComponent(value) : ''; - parts.push(key + '=' + encodeURIComponent(value)); - }); - return; - } - } - if (pair.value == undefined) pair[1] = ''; - parts.push(pair.map(encodeURIComponent).join('=')); - }); - - return parts.join('&'); - } -}); - -Object.extend(Hash.prototype, Enumerable); -Object.extend(Hash.prototype, { - _each: function(iterator) { - for (var key in this) { - var value = this[key]; - if (value && value == Hash.prototype[key]) continue; - - var pair = [key, value]; - pair.key = key; - pair.value = value; - iterator(pair); - } - }, - - keys: function() { - return this.pluck('key'); - }, - - values: function() { - return this.pluck('value'); - }, - - merge: function(hash) { - return $H(hash).inject(this, function(mergedHash, pair) { - mergedHash[pair.key] = pair.value; - return mergedHash; - }); - }, - - remove: function() { - var result; - for(var i = 0, length = arguments.length; i < length; i++) { - var value = this[arguments[i]]; - if (value !== undefined){ - if (result === undefined) result = value; - else { - if (result.constructor != Array) result = [result]; - result.push(value) - } - } - delete this[arguments[i]]; - } - return result; - }, - - toQueryString: function() { - return Hash.toQueryString(this); - }, - - inspect: function() { - return '#<Hash:{' + this.map(function(pair) { - return pair.map(Object.inspect).join(': '); - }).join(', ') + '}>'; - } -}); - -function $H(object) { - if (object && object.constructor == Hash) return object; - return new Hash(object); -}; -ObjectRange = Class.create(); -Object.extend(ObjectRange.prototype, Enumerable); -Object.extend(ObjectRange.prototype, { - initialize: function(start, end, exclusive) { - this.start = start; - this.end = end; - this.exclusive = exclusive; - }, - - _each: function(iterator) { - var value = this.start; - while (this.include(value)) { - iterator(value); - value = value.succ(); - } - }, - - include: function(value) { - if (value < this.start) - return false; - if (this.exclusive) - return value < this.end; - return value <= this.end; - } -}); - -var $R = function(start, end, exclusive) { - return new ObjectRange(start, end, exclusive); -} - -var Ajax = { - getTransport: function() { - return Try.these( - function() {return new XMLHttpRequest()}, - function() {return new ActiveXObject('Msxml2.XMLHTTP')}, - function() {return new ActiveXObject('Microsoft.XMLHTTP')} - ) || false; - }, - - activeRequestCount: 0 -} - -Ajax.Responders = { - responders: [], - - _each: function(iterator) { - this.responders._each(iterator); - }, - - register: function(responder) { - if (!this.include(responder)) - this.responders.push(responder); - }, - - unregister: function(responder) { - this.responders = this.responders.without(responder); - }, - - dispatch: function(callback, request, transport, json) { - this.each(function(responder) { - if (typeof responder[callback] == 'function') { - try { - responder[callback].apply(responder, [request, transport, json]); - } catch (e) {} - } - }); - } -}; - -Object.extend(Ajax.Responders, Enumerable); - -Ajax.Responders.register({ - onCreate: function() { - Ajax.activeRequestCount++; - }, - onComplete: function() { - Ajax.activeRequestCount--; - } -}); - -Ajax.Base = function() {}; -Ajax.Base.prototype = { - setOptions: function(options) { - this.options = { - method: 'post', - asynchronous: true, - contentType: 'application/x-www-form-urlencoded', - encoding: 'UTF-8', - parameters: '' - } - Object.extend(this.options, options || {}); - - this.options.method = this.options.method.toLowerCase(); - if (typeof this.options.parameters == 'string') - this.options.parameters = this.options.parameters.toQueryParams(); - } -} - -Ajax.Request = Class.create(); -Ajax.Request.Events = - ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; - -Ajax.Request.prototype = Object.extend(new Ajax.Base(), { - _complete: false, - - initialize: function(url, options) { - this.transport = Ajax.getTransport(); - this.setOptions(options); - this.request(url); - }, - - request: function(url) { - this.url = url; - this.method = this.options.method; - var params = this.options.parameters; - - if (!['get', 'post'].include(this.method)) { - // simulate other verbs over post - params['_method'] = this.method; - this.method = 'post'; - } - - params = Hash.toQueryString(params); - if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_=' - - // when GET, append parameters to URL - if (this.method == 'get' && params) - this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params; - - try { - Ajax.Responders.dispatch('onCreate', this, this.transport); - - this.transport.open(this.method.toUpperCase(), this.url, - this.options.asynchronous); - - if (this.options.asynchronous) - setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10); - - this.transport.onreadystatechange = this.onStateChange.bind(this); - this.setRequestHeaders(); - - var body = this.method == 'post' ? (this.options.postBody || params) : null; - - this.transport.send(body); - - /* Force Firefox to handle ready state 4 for synchronous requests */ - if (!this.options.asynchronous && this.transport.overrideMimeType) - this.onStateChange(); - - } - catch (e) { - this.dispatchException(e); - } - }, - - onStateChange: function() { - var readyState = this.transport.readyState; - if (readyState > 1 && !((readyState == 4) && this._complete)) - this.respondToReadyState(this.transport.readyState); - }, - - setRequestHeaders: function() { - var headers = { - 'X-Requested-With': 'XMLHttpRequest', - 'X-Prototype-Version': Prototype.Version, - 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*' - }; - - if (this.method == 'post') { - headers['Content-type'] = this.options.contentType + - (this.options.encoding ? '; charset=' + this.options.encoding : ''); - - /* Force "Connection: close" for older Mozilla browsers to work - * around a bug where XMLHttpRequest sends an incorrect - * Content-length header. See Mozilla Bugzilla #246651. - */ - if (this.transport.overrideMimeType && - (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) - headers['Connection'] = 'close'; - } - - // user-defined headers - if (typeof this.options.requestHeaders == 'object') { - var extras = this.options.requestHeaders; - - if (typeof extras.push == 'function') - for (var i = 0, length = extras.length; i < length; i += 2) - headers[extras[i]] = extras[i+1]; - else - $H(extras).each(function(pair) { headers[pair.key] = pair.value }); - } - - for (var name in headers) - this.transport.setRequestHeader(name, headers[name]); - }, - - success: function() { - return !this.transport.status - || (this.transport.status >= 200 && this.transport.status < 300); - }, - - respondToReadyState: function(readyState) { - var state = Ajax.Request.Events[readyState]; - var transport = this.transport, json = this.evalJSON(); - - if (state == 'Complete') { - try { - this._complete = true; - (this.options['on' + this.transport.status] - || this.options['on' + (this.success() ? 'Success' : 'Failure')] - || Prototype.emptyFunction)(transport, json); - } catch (e) { - this.dispatchException(e); - } - - if ((this.getHeader('Content-type') || 'text/javascript').strip(). - match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i)) - this.evalResponse(); - } - - try { - (this.options['on' + state] || Prototype.emptyFunction)(transport, json); - Ajax.Responders.dispatch('on' + state, this, transport, json); - } catch (e) { - this.dispatchException(e); - } - - if (state == 'Complete') { - // avoid memory leak in MSIE: clean up - this.transport.onreadystatechange = Prototype.emptyFunction; - } - }, - - getHeader: function(name) { - try { - return this.transport.getResponseHeader(name); - } catch (e) { return null } - }, - - evalJSON: function() { - try { - var json = this.getHeader('X-JSON'); - return json ? eval('(' + json + ')') : null; - } catch (e) { return null } - }, - - evalResponse: function() { - try { - return eval(this.transport.responseText); - } catch (e) { - this.dispatchException(e); - } - }, - - dispatchException: function(exception) { - (this.options.onException || Prototype.emptyFunction)(this, exception); - Ajax.Responders.dispatch('onException', this, exception); - } -}); - -Ajax.Updater = Class.create(); - -Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { - initialize: function(container, url, options) { - this.container = { - success: (container.success || container), - failure: (container.failure || (container.success ? null : container)) - } - - this.transport = Ajax.getTransport(); - this.setOptions(options); - - var onComplete = this.options.onComplete || Prototype.emptyFunction; - this.options.onComplete = (function(transport, param) { - this.updateContent(); - onComplete(transport, param); - }).bind(this); - - this.request(url); - }, - - updateContent: function() { - var receiver = this.container[this.success() ? 'success' : 'failure']; - var response = this.transport.responseText; - - if (!this.options.evalScripts) response = response.stripScripts(); - - if (receiver = $(receiver)) { - if (this.options.insertion) - new this.options.insertion(receiver, response); - else - receiver.update(response); - } - - if (this.success()) { - if (this.onComplete) - setTimeout(this.onComplete.bind(this), 10); - } - } -}); - -Ajax.PeriodicalUpdater = Class.create(); -Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), { - initialize: function(container, url, options) { - this.setOptions(options); - this.onComplete = this.options.onComplete; - - this.frequency = (this.options.frequency || 2); - this.decay = (this.options.decay || 1); - - this.updater = {}; - this.container = container; - this.url = url; - - this.start(); - }, - - start: function() { - this.options.onComplete = this.updateComplete.bind(this); - this.onTimerEvent(); - }, - - stop: function() { - this.updater.options.onComplete = undefined; - clearTimeout(this.timer); - (this.onComplete || Prototype.emptyFunction).apply(this, arguments); - }, - - updateComplete: function(request) { - if (this.options.decay) { - this.decay = (request.responseText == this.lastText ? - this.decay * this.options.decay : 1); - - this.lastText = request.responseText; - } - this.timer = setTimeout(this.onTimerEvent.bind(this), - this.decay * this.frequency * 1000); - }, - - onTimerEvent: function() { - this.updater = new Ajax.Updater(this.container, this.url, this.options); - } -}); -function $(element) { - if (arguments.length > 1) { - for (var i = 0, elements = [], length = arguments.length; i < length; i++) - elements.push($(arguments[i])); - return elements; - } - if (typeof element == 'string') - element = document.getElementById(element); - return Element.extend(element); -} - -if (Prototype.BrowserFeatures.XPath) { - document._getElementsByXPath = function(expression, parentElement) { - var results = []; - var query = document.evaluate(expression, $(parentElement) || document, - null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); - for (var i = 0, length = query.snapshotLength; i < length; i++) - results.push(query.snapshotItem(i)); - return results; - }; -} - -document.getElementsByClassName = function(className, parentElement) { - if (Prototype.BrowserFeatures.XPath) { - var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]"; - return document._getElementsByXPath(q, parentElement); - } else { - var children = ($(parentElement) || document.body).getElementsByTagName('*'); - var elements = [], child; - for (var i = 0, length = children.length; i < length; i++) { - child = children[i]; - if (Element.hasClassName(child, className)) - elements.push(Element.extend(child)); - } - return elements; - } -}; - -/*--------------------------------------------------------------------------*/ - -if (!window.Element) - var Element = new Object(); - -Element.extend = function(element) { - if (!element || _nativeExtensions || element.nodeType == 3) return element; - - if (!element._extended && element.tagName && element != window) { - var methods = Object.clone(Element.Methods), cache = Element.extend.cache; - - if (element.tagName == 'FORM') - Object.extend(methods, Form.Methods); - if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName)) - Object.extend(methods, Form.Element.Methods); - - Object.extend(methods, Element.Methods.Simulated); - - for (var property in methods) { - var value = methods[property]; - if (typeof value == 'function' && !(property in element)) - element[property] = cache.findOrStore(value); - } - } - - element._extended = true; - return element; -}; - -Element.extend.cache = { - findOrStore: function(value) { - return this[value] = this[value] || function() { - return value.apply(null, [this].concat($A(arguments))); - } - } -}; - -Element.Methods = { - visible: function(element) { - return $(element).style.display != 'none'; - }, - - toggle: function(element) { - element = $(element); - Element[Element.visible(element) ? 'hide' : 'show'](element); - return element; - }, - - hide: function(element) { - $(element).style.display = 'none'; - return element; - }, - - show: function(element) { - $(element).style.display = ''; - return element; - }, - - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - return element; - }, - - update: function(element, html) { - html = typeof html == 'undefined' ? '' : html.toString(); - $(element).innerHTML = html.stripScripts(); - setTimeout(function() {html.evalScripts()}, 10); - return element; - }, - - replace: function(element, html) { - element = $(element); - html = typeof html == 'undefined' ? '' : html.toString(); - if (element.outerHTML) { - element.outerHTML = html.stripScripts(); - } else { - var range = element.ownerDocument.createRange(); - range.selectNodeContents(element); - element.parentNode.replaceChild( - range.createContextualFragment(html.stripScripts()), element); - } - setTimeout(function() {html.evalScripts()}, 10); - return element; - }, - - inspect: function(element) { - element = $(element); - var result = '<' + element.tagName.toLowerCase(); - $H({'id': 'id', 'className': 'class'}).each(function(pair) { - var property = pair.first(), attribute = pair.last(); - var value = (element[property] || '').toString(); - if (value) result += ' ' + attribute + '=' + value.inspect(true); - }); - return result + '>'; - }, - - recursivelyCollect: function(element, property) { - element = $(element); - var elements = []; - while (element = element[property]) - if (element.nodeType == 1) - elements.push(Element.extend(element)); - return elements; - }, - - ancestors: function(element) { - return $(element).recursivelyCollect('parentNode'); - }, - - descendants: function(element) { - return $A($(element).getElementsByTagName('*')); - }, - - immediateDescendants: function(element) { - if (!(element = $(element).firstChild)) return []; - while (element && element.nodeType != 1) element = element.nextSibling; - if (element) return [element].concat($(element).nextSiblings()); - return []; - }, - - previousSiblings: function(element) { - return $(element).recursivelyCollect('previousSibling'); - }, - - nextSiblings: function(element) { - return $(element).recursivelyCollect('nextSibling'); - }, - - siblings: function(element) { - element = $(element); - return element.previousSiblings().reverse().concat(element.nextSiblings()); - }, - - match: function(element, selector) { - if (typeof selector == 'string') - selector = new Selector(selector); - return selector.match($(element)); - }, - - up: function(element, expression, index) { - return Selector.findElement($(element).ancestors(), expression, index); - }, - - down: function(element, expression, index) { - return Selector.findElement($(element).descendants(), expression, index); - }, - - previous: function(element, expression, index) { - return Selector.findElement($(element).previousSiblings(), expression, index); - }, - - next: function(element, expression, index) { - return Selector.findElement($(element).nextSiblings(), expression, index); - }, - - getElementsBySelector: function() { - var args = $A(arguments), element = $(args.shift()); - return Selector.findChildElements(element, args); - }, - - getElementsByClassName: function(element, className) { - return document.getElementsByClassName(className, element); - }, - - readAttribute: function(element, name) { - element = $(element); - if (document.all && !window.opera) { - var t = Element._attributeTranslations; - if (t.values[name]) return t.values[name](element, name); - if (t.names[name]) name = t.names[name]; - var attribute = element.attributes[name]; - if(attribute) return attribute.nodeValue; - } - return element.getAttribute(name); - }, - - getHeight: function(element) { - return $(element).getDimensions().height; - }, - - getWidth: function(element) { - return $(element).getDimensions().width; - }, - - classNames: function(element) { - return new Element.ClassNames(element); - }, - - hasClassName: function(element, className) { - if (!(element = $(element))) return; - var elementClassName = element.className; - if (elementClassName.length == 0) return false; - if (elementClassName == className || - elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) - return true; - return false; - }, - - addClassName: function(element, className) { - if (!(element = $(element))) return; - Element.classNames(element).add(className); - return element; - }, - - removeClassName: function(element, className) { - if (!(element = $(element))) return; - Element.classNames(element).remove(className); - return element; - }, - - toggleClassName: function(element, className) { - if (!(element = $(element))) return; - Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className); - return element; - }, - - observe: function() { - Event.observe.apply(Event, arguments); - return $A(arguments).first(); - }, - - stopObserving: function() { - Event.stopObserving.apply(Event, arguments); - return $A(arguments).first(); - }, - - // removes whitespace-only text node children - cleanWhitespace: function(element) { - element = $(element); - var node = element.firstChild; - while (node) { - var nextNode = node.nextSibling; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - element.removeChild(node); - node = nextNode; - } - return element; - }, - - empty: function(element) { - return $(element).innerHTML.match(/^\s*$/); - }, - - descendantOf: function(element, ancestor) { - element = $(element), ancestor = $(ancestor); - while (element = element.parentNode) - if (element == ancestor) return true; - return false; - }, - - scrollTo: function(element) { - element = $(element); - var pos = Position.cumulativeOffset(element); - window.scrollTo(pos[0], pos[1]); - return element; - }, - - getStyle: function(element, style) { - element = $(element); - if (['float','cssFloat'].include(style)) - style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat'); - style = style.camelize(); - var value = element.style[style]; - if (!value) { - if (document.defaultView && document.defaultView.getComputedStyle) { - var css = document.defaultView.getComputedStyle(element, null); - value = css ? css[style] : null; - } else if (element.currentStyle) { - value = element.currentStyle[style]; - } - } - - if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none')) - value = element['offset'+style.capitalize()] + 'px'; - - if (window.opera && ['left', 'top', 'right', 'bottom'].include(style)) - if (Element.getStyle(element, 'position') == 'static') value = 'auto'; - if(style == 'opacity') { - if(value) return parseFloat(value); - if(value = (element.getStyle('filter') || '').match(/alpha$opacity=(.*)$/)) - if(value[1]) return parseFloat(value[1]) / 100; - return 1.0; - } - return value == 'auto' ? null : value; - }, - - setStyle: function(element, style) { - element = $(element); - for (var name in style) { - var value = style[name]; - if(name == 'opacity') { - if (value == 1) { - value = (/Gecko/.test(navigator.userAgent) && - !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0; - if(/MSIE/.test(navigator.userAgent) && !window.opera) - element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,''); - } else if(value === '') { - if(/MSIE/.test(navigator.userAgent) && !window.opera) - element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,''); - } else { - if(value < 0.00001) value = 0; - if(/MSIE/.test(navigator.userAgent) && !window.opera) - element.style.filter = element.getStyle('filter').replace(/alpha$[^$]*\)/gi,'') + - 'alpha(opacity='+value*100+')'; - } - } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat'; - element.style[name.camelize()] = value; - } - return element; - }, - - getDimensions: function(element) { - element = $(element); - var display = $(element).getStyle('display'); - if (display != 'none' && display != null) // Safari bug - return {width: element.offsetWidth, height: element.offsetHeight}; - - // All *Width and *Height properties give 0 on elements with display none, - // so enable the element temporarily - var els = element.style; - var originalVisibility = els.visibility; - var originalPosition = els.position; - var originalDisplay = els.display; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = 'block'; - var originalWidth = element.clientWidth; - var originalHeight = element.clientHeight; - els.display = originalDisplay; - els.position = originalPosition; - els.visibility = originalVisibility; - return {width: originalWidth, height: originalHeight}; - }, - - makePositioned: function(element) { - element = $(element); - var pos = Element.getStyle(element, 'position'); - if (pos == 'static' || !pos) { - element._madePositioned = true; - element.style.position = 'relative'; - // Opera returns the offset relative to the positioning context, when an - // element is position relative but top and left have not been defined - if (window.opera) { - element.style.top = 0; - element.style.left = 0; - } - } - return element; - }, - - undoPositioned: function(element) { - element = $(element); - if (element._madePositioned) { - element._madePositioned = undefined; - element.style.position = - element.style.top = - element.style.left = - element.style.bottom = - element.style.right = ''; - } - return element; - }, - - makeClipping: function(element) { - element = $(element); - if (element._overflow) return element; - element._overflow = element.style.overflow || 'auto'; - if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') - element.style.overflow = 'hidden'; - return element; - }, - - undoClipping: function(element) { - element = $(element); - if (!element._overflow) return element; - element.style.overflow = element._overflow == 'auto' ? '' : element._overflow; - element._overflow = null; - return element; - } -}; - -Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf}); - -Element._attributeTranslations = {}; - -Element._attributeTranslations.names = { - colspan: "colSpan", - rowspan: "rowSpan", - valign: "vAlign", - datetime: "dateTime", - accesskey: "accessKey", - tabindex: "tabIndex", - enctype: "encType", - maxlength: "maxLength", - readonly: "readOnly", - longdesc: "longDesc" -}; - -Element._attributeTranslations.values = { - _getAttr: function(element, attribute) { - return element.getAttribute(attribute, 2); - }, - - _flag: function(element, attribute) { - return $(element).hasAttribute(attribute) ? attribute : null; - }, - - style: function(element) { - return element.style.cssText.toLowerCase(); - }, - - title: function(element) { - var node = element.getAttributeNode('title'); - return node.specified ? node.nodeValue : null; - } -}; - -Object.extend(Element._attributeTranslations.values, { - href: Element._attributeTranslations.values._getAttr, - src: Element._attributeTranslations.values._getAttr, - disabled: Element._attributeTranslations.values._flag, - checked: Element._attributeTranslations.values._flag, - readonly: Element._attributeTranslations.values._flag, - multiple: Element._attributeTranslations.values._flag -}); - -Element.Methods.Simulated = { - hasAttribute: function(element, attribute) { - var t = Element._attributeTranslations; - attribute = t.names[attribute] || attribute; - return $(element).getAttributeNode(attribute).specified; - } -}; - -// IE is missing .innerHTML support for TABLE-related elements -if (document.all && !window.opera){ - Element.Methods.update = function(element, html) { - element = $(element); - html = typeof html == 'undefined' ? '' : html.toString(); - var tagName = element.tagName.toUpperCase(); - if (['THEAD','TBODY','TR','TD'].include(tagName)) { - var div = document.createElement('div'); - switch (tagName) { - case 'THEAD': - case 'TBODY': - div.innerHTML = '<table><tbody>' + html.stripScripts() + '</tbody></table>'; - depth = 2; - break; - case 'TR': - div.innerHTML = '<table><tbody><tr>' + html.stripScripts() + '</tr></tbody></table>'; - depth = 3; - break; - case 'TD': - div.innerHTML = '<table><tbody><tr><td>' + html.stripScripts() + '</td></tr></tbody></table>'; - depth = 4; - } - $A(element.childNodes).each(function(node){ - element.removeChild(node) - }); - depth.times(function(){ div = div.firstChild }); - - $A(div.childNodes).each( - function(node){ element.appendChild(node) }); - } else { - element.innerHTML = html.stripScripts(); - } - setTimeout(function() {html.evalScripts()}, 10); - return element; - } -}; - -Object.extend(Element, Element.Methods); - -var _nativeExtensions = false; - -if(/Konqueror|Safari|KHTML/.test(navigator.userAgent)) - ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) { - var className = 'HTML' + tag + 'Element'; - if(window[className]) return; - var klass = window[className] = {}; - klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__; - }); - -Element.addMethods = function(methods) { - Object.extend(Element.Methods, methods || {}); - - function copy(methods, destination, onlyIfAbsent) { - onlyIfAbsent = onlyIfAbsent || false; - var cache = Element.extend.cache; - for (var property in methods) { - var value = methods[property]; - if (!onlyIfAbsent || !(property in destination)) - destination[property] = cache.findOrStore(value); - } - } - - if (typeof HTMLElement != 'undefined') { - copy(Element.Methods, HTMLElement.prototype); - copy(Element.Methods.Simulated, HTMLElement.prototype, true); - copy(Form.Methods, HTMLFormElement.prototype); - [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) { - copy(Form.Element.Methods, klass.prototype); - }); - _nativeExtensions = true; - } -} - -var Toggle = new Object(); -Toggle.display = Element.toggle; - -/*--------------------------------------------------------------------------*/ - -Abstract.Insertion = function(adjacency) { - this.adjacency = adjacency; -} - -Abstract.Insertion.prototype = { - initialize: function(element, content) { - this.element = $(element); - this.content = content.stripScripts(); - - if (this.adjacency && this.element.insertAdjacentHTML) { - try { - this.element.insertAdjacentHTML(this.adjacency, this.content); - } catch (e) { - var tagName = this.element.tagName.toUpperCase(); - if (['TBODY', 'TR'].include(tagName)) { - this.insertContent(this.contentFromAnonymousTable()); - } else { - throw e; - } - } - } else { - this.range = this.element.ownerDocument.createRange(); - if (this.initializeRange) this.initializeRange(); - this.insertContent([this.range.createContextualFragment(this.content)]); - } - - setTimeout(function() {content.evalScripts()}, 10); - }, - - contentFromAnonymousTable: function() { - var div = document.createElement('div'); - div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>'; - return $A(div.childNodes[0].childNodes[0].childNodes); - } -} - -var Insertion = new Object(); - -Insertion.Before = Class.create(); -Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), { - initializeRange: function() { - this.range.setStartBefore(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, this.element); - }).bind(this)); - } -}); - -Insertion.Top = Class.create(); -Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(true); - }, - - insertContent: function(fragments) { - fragments.reverse(false).each((function(fragment) { - this.element.insertBefore(fragment, this.element.firstChild); - }).bind(this)); - } -}); - -Insertion.Bottom = Class.create(); -Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.appendChild(fragment); - }).bind(this)); - } -}); - -Insertion.After = Class.create(); -Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), { - initializeRange: function() { - this.range.setStartAfter(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, - this.element.nextSibling); - }).bind(this)); - } -}); - -/*--------------------------------------------------------------------------*/ - -Element.ClassNames = Class.create(); -Element.ClassNames.prototype = { - initialize: function(element) { - this.element = $(element); - }, - - _each: function(iterator) { - this.element.className.split(/\s+/).select(function(name) { - return name.length > 0; - })._each(iterator); - }, - - set: function(className) { - this.element.className = className; - }, - - add: function(classNameToAdd) { - if (this.include(classNameToAdd)) return; - this.set($A(this).concat(classNameToAdd).join(' ')); - }, - - remove: function(classNameToRemove) { - if (!this.include(classNameToRemove)) return; - this.set($A(this).without(classNameToRemove).join(' ')); - }, - - toString: function() { - return $A(this).join(' '); - } -}; - -Object.extend(Element.ClassNames.prototype, Enumerable); -var Selector = Class.create(); -Selector.prototype = { - initialize: function(expression) { - this.params = {classNames: []}; - this.expression = expression.toString().strip(); - this.parseExpression(); - this.compileMatcher(); - }, - - parseExpression: function() { - function abort(message) { throw 'Parse error in selector: ' + message; } - - if (this.expression == '') abort('empty expression'); - - var params = this.params, expr = this.expression, match, modifier, clause, rest; - while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) { - params.attributes = params.attributes || []; - params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''}); - expr = match[1]; - } - - if (expr == '*') return this.params.wildcard = true; - - while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) { - modifier = match[1], clause = match[2], rest = match[3]; - switch (modifier) { - case '#': params.id = clause; break; - case '.': params.classNames.push(clause); break; - case '': - case undefined: params.tagName = clause.toUpperCase(); break; - default: abort(expr.inspect()); - } - expr = rest; - } - - if (expr.length > 0) abort(expr.inspect()); - }, - - buildMatchExpression: function() { - var params = this.params, conditions = [], clause; - - if (params.wildcard) - conditions.push('true'); - if (clause = params.id) - conditions.push('element.readAttribute("id") == ' + clause.inspect()); - if (clause = params.tagName) - conditions.push('element.tagName.toUpperCase() == ' + clause.inspect()); - if ((clause = params.classNames).length > 0) - for (var i = 0, length = clause.length; i < length; i++) - conditions.push('element.hasClassName(' + clause[i].inspect() + ')'); - if (clause = params.attributes) { - clause.each(function(attribute) { - var value = 'element.readAttribute(' + attribute.name.inspect() + ')'; - var splitValueBy = function(delimiter) { - return value + ' && ' + value + '.split(' + delimiter.inspect() + ')'; - } - - switch (attribute.operator) { - case '=': conditions.push(value + ' == ' + attribute.value.inspect()); break; - case '~=': conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break; - case '|=': conditions.push( - splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect() - ); break; - case '!=': conditions.push(value + ' != ' + attribute.value.inspect()); break; - case '': - case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break; - default: throw 'Unknown operator ' + attribute.operator + ' in selector'; - } - }); - } - - return conditions.join(' && '); - }, - - compileMatcher: function() { - this.match = new Function('element', 'if (!element.tagName) return false; \ - element = $(element); \ - return ' + this.buildMatchExpression()); - }, - - findElements: function(scope) { - var element; - - if (element = $(this.params.id)) - if (this.match(element)) - if (!scope || Element.childOf(element, scope)) - return [element]; - - scope = (scope || document).getElementsByTagName(this.params.tagName || '*'); - - var results = []; - for (var i = 0, length = scope.length; i < length; i++) - if (this.match(element = scope[i])) - results.push(Element.extend(element)); - - return results; - }, - - toString: function() { - return this.expression; - } -} - -Object.extend(Selector, { - matchElements: function(elements, expression) { - var selector = new Selector(expression); - return elements.select(selector.match.bind(selector)).map(Element.extend); - }, - - findElement: function(elements, expression, index) { - if (typeof expression == 'number') index = expression, expression = false; - return Selector.matchElements(elements, expression || '*')[index || 0]; - }, - - findChildElements: function(element, expressions) { - return expressions.map(function(expression) { - return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) { - var selector = new Selector(expr); - return results.inject([], function(elements, result) { - return elements.concat(selector.findElements(result || element)); - }); - }); - }).flatten(); - } -}); - -function $$() { - return Selector.findChildElements(document, $A(arguments)); -} -var Form = { - reset: function(form) { - $(form).reset(); - return form; - }, - - serializeElements: function(elements, getHash) { - var data = elements.inject({}, function(result, element) { - if (!element.disabled && element.name) { - var key = element.name, value = $(element).getValue(); - if (value != undefined) { - if (result[key]) { - if (result[key].constructor != Array) result[key] = [result[key]]; - result[key].push(value); - } - else result[key] = value; - } - } - return result; - }); - - return getHash ? data : Hash.toQueryString(data); - } -}; - -Form.Methods = { - serialize: function(form, getHash) { - return Form.serializeElements(Form.getElements(form), getHash); - }, - - getElements: function(form) { - return $A($(form).getElementsByTagName('*')).inject([], - function(elements, child) { - if (Form.Element.Serializers[child.tagName.toLowerCase()]) - elements.push(Element.extend(child)); - return elements; - } - ); - }, - - getInputs: function(form, typeName, name) { - form = $(form); - var inputs = form.getElementsByTagName('input'); - - if (!typeName && !name) return $A(inputs).map(Element.extend); - - for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) { - var input = inputs[i]; - if ((typeName && input.type != typeName) || (name && input.name != name)) - continue; - matchingInputs.push(Element.extend(input)); - } - - return matchingInputs; - }, - - disable: function(form) { - form = $(form); - form.getElements().each(function(element) { - element.blur(); - element.disabled = 'true'; - }); - return form; - }, - - enable: function(form) { - form = $(form); - form.getElements().each(function(element) { - element.disabled = ''; - }); - return form; - }, - - findFirstElement: function(form) { - return $(form).getElements().find(function(element) { - return element.type != 'hidden' && !element.disabled && - ['input', 'select', 'textarea'].include(element.tagName.toLowerCase()); - }); - }, - - focusFirstElement: function(form) { - form = $(form); - form.findFirstElement().activate(); - return form; - } -} - -Object.extend(Form, Form.Methods); - -/*--------------------------------------------------------------------------*/ - -Form.Element = { - focus: function(element) { - $(element).focus(); - return element; - }, - - select: function(element) { - $(element).select(); - return element; - } -} - -Form.Element.Methods = { - serialize: function(element) { - element = $(element); - if (!element.disabled && element.name) { - var value = element.getValue(); - if (value != undefined) { - var pair = {}; - pair[element.name] = value; - return Hash.toQueryString(pair); - } - } - return ''; - }, - - getValue: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - return Form.Element.Serializers[method](element); - }, - - clear: function(element) { - $(element).value = ''; - return element; - }, - - present: function(element) { - return $(element).value != ''; - }, - - activate: function(element) { - element = $(element); - element.focus(); - if (element.select && ( element.tagName.toLowerCase() != 'input' || - !['button', 'reset', 'submit'].include(element.type) ) ) - element.select(); - return element; - }, - - disable: function(element) { - element = $(element); - element.disabled = true; - return element; - }, - - enable: function(element) { - element = $(element); - element.blur(); - element.disabled = false; - return element; - } -} - -Object.extend(Form.Element, Form.Element.Methods); -var Field = Form.Element; -var $F = Form.Element.getValue; - -/*--------------------------------------------------------------------------*/ - -Form.Element.Serializers = { - input: function(element) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - return Form.Element.Serializers.inputSelector(element); - default: - return Form.Element.Serializers.textarea(element); - } - }, - - inputSelector: function(element) { - return element.checked ? element.value : null; - }, - - textarea: function(element) { - return element.value; - }, - - select: function(element) { - return this[element.type == 'select-one' ? - 'selectOne' : 'selectMany'](element); - }, - - selectOne: function(element) { - var index = element.selectedIndex; - return index >= 0 ? this.optionValue(element.options[index]) : null; - }, - - selectMany: function(element) { - var values, length = element.length; - if (!length) return null; - - for (var i = 0, values = []; i < length; i++) { - var opt = element.options[i]; - if (opt.selected) values.push(this.optionValue(opt)); - } - return values; - }, - - optionValue: function(opt) { - // extend element because hasAttribute may not be native - return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text; - } -} - -/*--------------------------------------------------------------------------*/ - -Abstract.TimedObserver = function() {} -Abstract.TimedObserver.prototype = { - initialize: function(element, frequency, callback) { - this.frequency = frequency; - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - this.registerCallback(); - }, - - registerCallback: function() { - setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - onTimerEvent: function() { - var value = this.getValue(); - var changed = ('string' == typeof this.lastValue && 'string' == typeof value - ? this.lastValue != value : String(this.lastValue) != String(value)); - if (changed) { - this.callback(this.element, value); - this.lastValue = value; - } - } -} - -Form.Element.Observer = Class.create(); -Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.Observer = Class.create(); -Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); - -/*--------------------------------------------------------------------------*/ - -Abstract.EventObserver = function() {} -Abstract.EventObserver.prototype = { - initialize: function(element, callback) { - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - if (this.element.tagName.toLowerCase() == 'form') - this.registerFormCallbacks(); - else - this.registerCallback(this.element); - }, - - onElementEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - }, - - registerFormCallbacks: function() { - Form.getElements(this.element).each(this.registerCallback.bind(this)); - }, - - registerCallback: function(element) { - if (element.type) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - Event.observe(element, 'click', this.onElementEvent.bind(this)); - break; - default: - Event.observe(element, 'change', this.onElementEvent.bind(this)); - break; - } - } - } -} - -Form.Element.EventObserver = Class.create(); -Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.EventObserver = Class.create(); -Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); -if (!window.Event) { - var Event = new Object(); -} - -Object.extend(Event, { - KEY_BACKSPACE: 8, - KEY_TAB: 9, - KEY_RETURN: 13, - KEY_ESC: 27, - KEY_LEFT: 37, - KEY_UP: 38, - KEY_RIGHT: 39, - KEY_DOWN: 40, - KEY_DELETE: 46, - KEY_HOME: 36, - KEY_END: 35, - KEY_PAGEUP: 33, - KEY_PAGEDOWN: 34, - - element: function(event) { - return event.target || event.srcElement; - }, - - isLeftClick: function(event) { - return (((event.which) && (event.which == 1)) || - ((event.button) && (event.button == 1))); - }, - - pointerX: function(event) { - return event.pageX || (event.clientX + - (document.documentElement.scrollLeft || document.body.scrollLeft)); - }, - - pointerY: function(event) { - return event.pageY || (event.clientY + - (document.documentElement.scrollTop || document.body.scrollTop)); - }, - - stop: function(event) { - if (event.preventDefault) { - event.preventDefault(); - event.stopPropagation(); - } else { - event.returnValue = false; - event.cancelBubble = true; - } - }, - - // find the first node with the given tagName, starting from the - // node the event was triggered on; traverses the DOM upwards - findElement: function(event, tagName) { - var element = Event.element(event); - while (element.parentNode && (!element.tagName || - (element.tagName.toUpperCase() != tagName.toUpperCase()))) - element = element.parentNode; - return element; - }, - - observers: false, - - _observeAndCache: function(element, name, observer, useCapture) { - if (!this.observers) this.observers = []; - if (element.addEventListener) { - this.observers.push([element, name, observer, useCapture]); - element.addEventListener(name, observer, useCapture); - } else if (element.attachEvent) { - this.observers.push([element, name, observer, useCapture]); - element.attachEvent('on' + name, observer); - } - }, - - unloadCache: function() { - if (!Event.observers) return; - for (var i = 0, length = Event.observers.length; i < length; i++) { - Event.stopObserving.apply(this, Event.observers[i]); - Event.observers[i][0] = null; - } - Event.observers = false; - }, - - observe: function(element, name, observer, useCapture) { - element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.attachEvent)) - name = 'keydown'; - - Event._observeAndCache(element, name, observer, useCapture); - }, - - stopObserving: function(element, name, observer, useCapture) { - element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.detachEvent)) - name = 'keydown'; - - if (element.removeEventListener) { - element.removeEventListener(name, observer, useCapture); - } else if (element.detachEvent) { - try { - element.detachEvent('on' + name, observer); - } catch (e) {} - } - } -}); - -/* prevent memory leaks in IE */ -if (navigator.appVersion.match(/\bMSIE\b/)) - Event.observe(window, 'unload', Event.unloadCache, false); -var Position = { - // set to true if needed, warning: firefox performance problems - // NOT neeeded for page scrolling, only if draggable contained in - // scrollable elements - includeScrollOffsets: false, - - // must be called before calling withinIncludingScrolloffset, every time the - // page is scrolled - prepare: function() { - this.deltaX = window.pageXOffset - || document.documentElement.scrollLeft - || document.body.scrollLeft - || 0; - this.deltaY = window.pageYOffset - || document.documentElement.scrollTop - || document.body.scrollTop - || 0; - }, - - realOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - element = element.parentNode; - } while (element); - return [valueL, valueT]; - }, - - cumulativeOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - } while (element); - return [valueL, valueT]; - }, - - positionedOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - if (element) { - if(element.tagName=='BODY') break; - var p = Element.getStyle(element, 'position'); - if (p == 'relative' || p == 'absolute') break; - } - } while (element); - return [valueL, valueT]; - }, - - offsetParent: function(element) { - if (element.offsetParent) return element.offsetParent; - if (element == document.body) return element; - - while ((element = element.parentNode) && element != document.body) - if (Element.getStyle(element, 'position') != 'static') - return element; - - return document.body; - }, - - // caches x/y coordinate pair to use with overlap - within: function(element, x, y) { - if (this.includeScrollOffsets) - return this.withinIncludingScrolloffsets(element, x, y); - this.xcomp = x; - this.ycomp = y; - this.offset = this.cumulativeOffset(element); - - return (y >= this.offset[1] && - y < this.offset[1] + element.offsetHeight && - x >= this.offset[0] && - x < this.offset[0] + element.offsetWidth); - }, - - withinIncludingScrolloffsets: function(element, x, y) { - var offsetcache = this.realOffset(element); - - this.xcomp = x + offsetcache[0] - this.deltaX; - this.ycomp = y + offsetcache[1] - this.deltaY; - this.offset = this.cumulativeOffset(element); - - return (this.ycomp >= this.offset[1] && - this.ycomp < this.offset[1] + element.offsetHeight && - this.xcomp >= this.offset[0] && - this.xcomp < this.offset[0] + element.offsetWidth); - }, - - // within must be called directly before - overlap: function(mode, element) { - if (!mode) return 0; - if (mode == 'vertical') - return ((this.offset[1] + element.offsetHeight) - this.ycomp) / - element.offsetHeight; - if (mode == 'horizontal') - return ((this.offset[0] + element.offsetWidth) - this.xcomp) / - element.offsetWidth; - }, - - page: function(forElement) { - var valueT = 0, valueL = 0; - - var element = forElement; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - - // Safari fix - if (element.offsetParent==document.body) - if (Element.getStyle(element,'position')=='absolute') break; - - } while (element = element.offsetParent); - - element = forElement; - do { - if (!window.opera || element.tagName=='BODY') { - valueT -= element.scrollTop || 0; - valueL -= element.scrollLeft || 0; - } - } while (element = element.parentNode); - - return [valueL, valueT]; - }, - - clone: function(source, target) { - var options = Object.extend({ - setLeft: true, - setTop: true, - setWidth: true, - setHeight: true, - offsetTop: 0, - offsetLeft: 0 - }, arguments[2] || {}) - - // find page position of source - source = $(source); - var p = Position.page(source); - - // find coordinate system to use - target = $(target); - var delta = [0, 0]; - var parent = null; - // delta [0,0] will do fine with position: fixed elements, - // position:absolute needs offsetParent deltas - if (Element.getStyle(target,'position') == 'absolute') { - parent = Position.offsetParent(target); - delta = Position.page(parent); - } - - // correct by body offsets (fixes Safari) - if (parent == document.body) { - delta[0] -= document.body.offsetLeft; - delta[1] -= document.body.offsetTop; - } - - // set position - if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; - if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; - if(options.setWidth) target.style.width = source.offsetWidth + 'px'; - if(options.setHeight) target.style.height = source.offsetHeight + 'px'; - }, - - absolutize: function(element) { - element = $(element); - if (element.style.position == 'absolute') return; - Position.prepare(); - - var offsets = Position.positionedOffset(element); - var top = offsets[1]; - var left = offsets[0]; - var width = element.clientWidth; - var height = element.clientHeight; - - element._originalLeft = left - parseFloat(element.style.left || 0); - element._originalTop = top - parseFloat(element.style.top || 0); - element._originalWidth = element.style.width; - element._originalHeight = element.style.height; - - element.style.position = 'absolute'; - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.width = width + 'px'; - element.style.height = height + 'px'; - }, - - relativize: function(element) { - element = $(element); - if (element.style.position == 'relative') return; - Position.prepare(); - - element.style.position = 'relative'; - var top = parseFloat(element.style.top || 0) - (element._originalTop || 0); - var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); - - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.height = element._originalHeight; - element.style.width = element._originalWidth; - } -} - -// Safari returns margins on body which is incorrect if the child is absolutely -// positioned. For performance reasons, redefine Position.cumulativeOffset for -// KHTML/WebKit only. -if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { - Position.cumulativeOffset = function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - if (element.offsetParent == document.body) - if (Element.getStyle(element, 'position') == 'absolute') break; - - element = element.offsetParent; - } while (element); - - return [valueL, valueT]; - } -} - -Element.addMethods(); \ No newline at end of file Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/scriptaculous.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/scriptaculous.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/scriptaculous.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,51 +0,0 @@ -// script.aculo.us scriptaculous.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -var Scriptaculous = { - Version: '1.7.0', - require: function(libraryName) { - // inserting via DOM fails in Safari 2.0, so brute force approach - document.write('<script type="text/javascript" src="'+libraryName+'"></script>'); - }, - load: function() { - if((typeof Prototype=='undefined') || - (typeof Element == 'undefined') || - (typeof Element.Methods=='undefined') || - parseFloat(Prototype.Version.split(".")[0] + "." + - Prototype.Version.split(".")[1]) < 1.5) - throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0"); - - $A(document.getElementsByTagName("script")).findAll( function(s) { - return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/)) - }).each( function(s) { - var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,''); - var includes = s.src.match(/\?.*load=([a-z,]*)/); - (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider').split(',').each( - function(include) { Scriptaculous.require(path+include+'.js') }); - }); - } -} - -Scriptaculous.load(); \ No newline at end of file Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/slider.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/slider.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/slider.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,278 +0,0 @@ -// script.aculo.us slider.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -if(!Control) var Control = {}; -Control.Slider = Class.create(); - -// options: -// axis: 'vertical', or 'horizontal' (default) -// -// callbacks: -// onChange(value) -// onSlide(value) -Control.Slider.prototype = { - initialize: function(handle, track, options) { - var slider = this; - - if(handle instanceof Array) { - this.handles = handle.collect( function(e) { return $(e) }); - } else { - this.handles = [$(handle)]; - } - - this.track = $(track); - this.options = options || {}; - - this.axis = this.options.axis || 'horizontal'; - this.increment = this.options.increment || 1; - this.step = parseInt(this.options.step || '1'); - this.range = this.options.range || $R(0,1); - - this.value = 0; // assure backwards compat - this.values = this.handles.map( function() { return 0 }); - this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false; - this.options.startSpan = $(this.options.startSpan || null); - this.options.endSpan = $(this.options.endSpan || null); - - this.restricted = this.options.restricted || false; - - this.maximum = this.options.maximum || this.range.end; - this.minimum = this.options.minimum || this.range.start; - - // Will be used to align the handle onto the track, if necessary - this.alignX = parseInt(this.options.alignX || '0'); - this.alignY = parseInt(this.options.alignY || '0'); - - this.trackLength = this.maximumOffset() - this.minimumOffset(); - - this.handleLength = this.isVertical() ? - (this.handles[0].offsetHeight != 0 ? - this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : - (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : - this.handles[0].style.width.replace(/px$/,"")); - - this.active = false; - this.dragging = false; - this.disabled = false; - - if(this.options.disabled) this.setDisabled(); - - // Allowed values array - this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false; - if(this.allowedValues) { - this.minimum = this.allowedValues.min(); - this.maximum = this.allowedValues.max(); - } - - this.eventMouseDown = this.startDrag.bindAsEventListener(this); - this.eventMouseUp = this.endDrag.bindAsEventListener(this); - this.eventMouseMove = this.update.bindAsEventListener(this); - - // Initialize handles in reverse (make sure first handle is active) - this.handles.each( function(h,i) { - i = slider.handles.length-1-i; - slider.setValue(parseFloat( - (slider.options.sliderValue instanceof Array ? - slider.options.sliderValue[i] : slider.options.sliderValue) || - slider.range.start), i); - Element.makePositioned(h); // fix IE - Event.observe(h, "mousedown", slider.eventMouseDown); - }); - - Event.observe(this.track, "mousedown", this.eventMouseDown); - Event.observe(document, "mouseup", this.eventMouseUp); - Event.observe(document, "mousemove", this.eventMouseMove); - - this.initialized = true; - }, - dispose: function() { - var slider = this; - Event.stopObserving(this.track, "mousedown", this.eventMouseDown); - Event.stopObserving(document, "mouseup", this.eventMouseUp); - Event.stopObserving(document, "mousemove", this.eventMouseMove); - this.handles.each( function(h) { - Event.stopObserving(h, "mousedown", slider.eventMouseDown); - }); - }, - setDisabled: function(){ - this.disabled = true; - }, - setEnabled: function(){ - this.disabled = false; - }, - getNearestValue: function(value){ - if(this.allowedValues){ - if(value >= this.allowedValues.max()) return(this.allowedValues.max()); - if(value <= this.allowedValues.min()) return(this.allowedValues.min()); - - var offset = Math.abs(this.allowedValues[0] - value); - var newValue = this.allowedValues[0]; - this.allowedValues.each( function(v) { - var currentOffset = Math.abs(v - value); - if(currentOffset <= offset){ - newValue = v; - offset = currentOffset; - } - }); - return newValue; - } - if(value > this.range.end) return this.range.end; - if(value < this.range.start) return this.range.start; - return value; - }, - setValue: function(sliderValue, handleIdx){ - if(!this.active) { - this.activeHandleIdx = handleIdx || 0; - this.activeHandle = this.handles[this.activeHandleIdx]; - this.updateStyles(); - } - handleIdx = handleIdx || this.activeHandleIdx || 0; - if(this.initialized && this.restricted) { - if((handleIdx>0) && (sliderValue<this.values[handleIdx-1])) - sliderValue = this.values[handleIdx-1]; - if((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1])) - sliderValue = this.values[handleIdx+1]; - } - sliderValue = this.getNearestValue(sliderValue); - this.values[handleIdx] = sliderValue; - this.value = this.values[0]; // assure backwards compat - - this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = - this.translateToPx(sliderValue); - - this.drawSpans(); - if(!this.dragging || !this.event) this.updateFinished(); - }, - setValueBy: function(delta, handleIdx) { - this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, - handleIdx || this.activeHandleIdx || 0); - }, - translateToPx: function(value) { - return Math.round( - ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * - (value - this.range.start)) + "px"; - }, - translateToValue: function(offset) { - return ((offset/(this.trackLength-this.handleLength) * - (this.range.end-this.range.start)) + this.range.start); - }, - getRange: function(range) { - var v = this.values.sortBy(Prototype.K); - range = range || 0; - return $R(v[range],v[range+1]); - }, - minimumOffset: function(){ - return(this.isVertical() ? this.alignY : this.alignX); - }, - maximumOffset: function(){ - return(this.isVertical() ? - (this.track.offsetHeight != 0 ? this.track.offsetHeight : - this.track.style.height.replace(/px$/,"")) - this.alignY : - (this.track.offsetWidth != 0 ? this.track.offsetWidth : - this.track.style.width.replace(/px$/,"")) - this.alignY); - }, - isVertical: function(){ - return (this.axis == 'vertical'); - }, - drawSpans: function() { - var slider = this; - if(this.spans) - $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) }); - if(this.options.startSpan) - this.setSpan(this.options.startSpan, - $R(0, this.values.length>1 ? this.getRange(0).min() : this.value )); - if(this.options.endSpan) - this.setSpan(this.options.endSpan, - $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum)); - }, - setSpan: function(span, range) { - if(this.isVertical()) { - span.style.top = this.translateToPx(range.start); - span.style.height = this.translateToPx(range.end - range.start + this.range.start); - } else { - span.style.left = this.translateToPx(range.start); - span.style.width = this.translateToPx(range.end - range.start + this.range.start); - } - }, - updateStyles: function() { - this.handles.each( function(h){ Element.removeClassName(h, 'selected') }); - Element.addClassName(this.activeHandle, 'selected'); - }, - startDrag: function(event) { - if(Event.isLeftClick(event)) { - if(!this.disabled){ - this.active = true; - - var handle = Event.element(event); - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var track = handle; - if(track==this.track) { - var offsets = Position.cumulativeOffset(this.track); - this.event = event; - this.setValue(this.translateToValue( - (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2) - )); - var offsets = Position.cumulativeOffset(this.activeHandle); - this.offsetX = (pointer[0] - offsets[0]); - this.offsetY = (pointer[1] - offsets[1]); - } else { - // find the handle (prevents issues with Safari) - while((this.handles.indexOf(handle) == -1) && handle.parentNode) - handle = handle.parentNode; - - if(this.handles.indexOf(handle)!=-1) { - this.activeHandle = handle; - this.activeHandleIdx = this.handles.indexOf(this.activeHandle); - this.updateStyles(); - - var offsets = Position.cumulativeOffset(this.activeHandle); - this.offsetX = (pointer[0] - offsets[0]); - this.offsetY = (pointer[1] - offsets[1]); - } - } - } - Event.stop(event); - } - }, - update: function(event) { - if(this.active) { - if(!this.dragging) this.dragging = true; - this.draw(event); - // fix AppleWebKit rendering - if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); - Event.stop(event); - } - }, - draw: function(event) { - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var offsets = Position.cumulativeOffset(this.track); - pointer[0] -= this.offsetX + offsets[0]; - pointer[1] -= this.offsetY + offsets[1]; - this.event = event; - this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] )); - if(this.initialized && this.options.onSlide) - this.options.onSlide(this.values.length>1 ? this.values : this.value, this); - }, - endDrag: function(event) { - if(this.active && this.dragging) { - this.finishDrag(event, true); - Event.stop(event); - } - this.active = false; - this.dragging = false; - }, - finishDrag: function(event, success) { - this.active = false; - this.dragging = false; - this.updateFinished(); - }, - updateFinished: function() { - if(this.initialized && this.options.onChange) - this.options.onChange(this.values.length>1 ? this.values : this.value, this); - this.event = null; - } -} \ No newline at end of file Deleted: trunk/theme/src/bin/portal-ajax-war/js/portal/unittest.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/unittest.js 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/unittest.js 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,564 +0,0 @@ -// script.aculo.us unittest.js v1.7.0, Fri Jan 19 19:16:36 CET 2007 - -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) -// (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -// experimental, Firefox-only -Event.simulateMouse = function(element, eventName) { - var options = Object.extend({ - pointerX: 0, - pointerY: 0, - buttons: 0, - ctrlKey: false, - altKey: false, - shiftKey: false, - metaKey: false - }, arguments[2] || {}); - var oEvent = document.createEvent("MouseEvents"); - oEvent.initMouseEvent(eventName, true, true, document.defaultView, - options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, - options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element)); - - if(this.mark) Element.remove(this.mark); - this.mark = document.createElement('div'); - this.mark.appendChild(document.createTextNode(" ")); - document.body.appendChild(this.mark); - this.mark.style.position = 'absolute'; - this.mark.style.top = options.pointerY + "px"; - this.mark.style.left = options.pointerX + "px"; - this.mark.style.width = "5px"; - this.mark.style.height = "5px;"; - this.mark.style.borderTop = "1px solid red;" - this.mark.style.borderLeft = "1px solid red;" - - if(this.step) - alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); - - $(element).dispatchEvent(oEvent); -}; - -// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2. -// You need to downgrade to 1.0.4 for now to get this working -// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much -Event.simulateKey = function(element, eventName) { - var options = Object.extend({ - ctrlKey: false, - altKey: false, - shiftKey: false, - metaKey: false, - keyCode: 0, - charCode: 0 - }, arguments[2] || {}); - - var oEvent = document.createEvent("KeyEvents"); - oEvent.initKeyEvent(eventName, true, true, window, - options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, - options.keyCode, options.charCode ); - $(element).dispatchEvent(oEvent); -}; - -Event.simulateKeys = function(element, command) { - for(var i=0; i<command.length; i++) { - Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)}); - } -}; - -var Test = {} -Test.Unit = {}; - -// security exception workaround -Test.Unit.inspect = Object.inspect; - -Test.Unit.Logger = Class.create(); -Test.Unit.Logger.prototype = { - initialize: function(log) { - this.log = $(log); - if (this.log) { - this._createLogTable(); - } - }, - start: function(testName) { - if (!this.log) return; - this.testName = testName; - this.lastLogLine = document.createElement('tr'); - this.statusCell = document.createElement('td'); - this.nameCell = document.createElement('td'); - this.nameCell.className = "nameCell"; - this.nameCell.appendChild(document.createTextNode(testName)); - this.messageCell = document.createElement('td'); - this.lastLogLine.appendChild(this.statusCell); - this.lastLogLine.appendChild(this.nameCell); - this.lastLogLine.appendChild(this.messageCell); - this.loglines.appendChild(this.lastLogLine); - }, - finish: function(status, summary) { - if (!this.log) return; - this.lastLogLine.className = status; - this.statusCell.innerHTML = status; - this.messageCell.innerHTML = this._toHTML(summary); - this.addLinksToResults(); - }, - message: function(message) { - if (!this.log) return; - this.messageCell.innerHTML = this._toHTML(message); - }, - summary: function(summary) { - if (!this.log) return; - this.logsummary.innerHTML = this._toHTML(summary); - }, - _createLogTable: function() { - this.log.innerHTML = - '<div id="logsummary"></div>' + - '<table id="logtable">' + - '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' + - '<tbody id="loglines"></tbody>' + - '</table>'; - this.logsummary = $('logsummary') - this.loglines = $('loglines'); - }, - _toHTML: function(txt) { - return txt.escapeHTML().replace(/\n/g,"<br/>"); - }, - addLinksToResults: function(){ - $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log - td.title = "Run only this test" - Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;}); - }); - $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log - td.title = "Run all tests" - Event.observe(td, 'click', function(){ window.location.search = "";}); - }); - } -} - -Test.Unit.Runner = Class.create(); -Test.Unit.Runner.prototype = { - initialize: function(testcases) { - this.options = Object.extend({ - testLog: 'testlog' - }, arguments[1] || {}); - this.options.resultsURL = this.parseResultsURLQueryParameter(); - this.options.tests = this.parseTestsQueryParameter(); - if (this.options.testLog) { - this.options.testLog = $(this.options.testLog) || null; - } - if(this.options.tests) { - this.tests = []; - for(var i = 0; i < this.options.tests.length; i++) { - if(/^test/.test(this.options.tests[i])) { - this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"])); - } - } - } else { - if (this.options.test) { - this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])]; - } else { - this.tests = []; - for(var testcase in testcases) { - if(/^test/.test(testcase)) { - this.tests.push( - new Test.Unit.Testcase( - this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, - testcases[testcase], testcases["setup"], testcases["teardown"] - )); - } - } - } - } - this.currentTest = 0; - this.logger = new Test.Unit.Logger(this.options.testLog); - setTimeout(this.runTests.bind(this), 1000); - }, - parseResultsURLQueryParameter: function() { - return window.location.search.parseQuery()["resultsURL"]; - }, - parseTestsQueryParameter: function(){ - if (window.location.search.parseQuery()["tests"]){ - return window.location.search.parseQuery()["tests"].split(','); - }; - }, - // Returns: - // "ERROR" if there was an error, - // "FAILURE" if there was a failure, or - // "SUCCESS" if there was neither - getResult: function() { - var hasFailure = false; - for(var i=0;i<this.tests.length;i++) { - if (this.tests[i].errors > 0) { - return "ERROR"; - } - if (this.tests[i].failures > 0) { - hasFailure = true; - } - } - if (hasFailure) { - return "FAILURE"; - } else { - return "SUCCESS"; - } - }, - postResults: function() { - if (this.options.resultsURL) { - new Ajax.Request(this.options.resultsURL, - { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false }); - } - }, - runTests: function() { - var test = this.tests[this.currentTest]; - if (!test) { - // finished! - this.postResults(); - this.logger.summary(this.summary()); - return; - } - if(!test.isWaiting) { - this.logger.start(test.name); - } - test.run(); - if(test.isWaiting) { - this.logger.message("Waiting for " + test.timeToWait + "ms"); - setTimeout(this.runTests.bind(this), test.timeToWait || 1000); - } else { - this.logger.finish(test.status(), test.summary()); - this.currentTest++; - // tail recursive, hopefully the browser will skip the stackframe - this.runTests(); - } - }, - summary: function() { - var assertions = 0; - var failures = 0; - var errors = 0; - var messages = []; - for(var i=0;i<this.tests.length;i++) { - assertions += this.tests[i].assertions; - failures += this.tests[i].failures; - errors += this.tests[i].errors; - } - return ( - (this.options.context ? this.options.context + ': ': '') + - this.tests.length + " tests, " + - assertions + " assertions, " + - failures + " failures, " + - errors + " errors"); - } -} - -Test.Unit.Assertions = Class.create(); -Test.Unit.Assertions.prototype = { - initialize: function() { - this.assertions = 0; - this.failures = 0; - this.errors = 0; - this.messages = []; - }, - summary: function() { - return ( - this.assertions + " assertions, " + - this.failures + " failures, " + - this.errors + " errors" + "\n" + - this.messages.join("\n")); - }, - pass: function() { - this.assertions++; - }, - fail: function(message) { - this.failures++; - this.messages.push("Failure: " + message); - }, - info: function(message) { - this.messages.push("Info: " + message); - }, - error: function(error) { - this.errors++; - this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")"); - }, - status: function() { - if (this.failures > 0) return 'failed'; - if (this.errors > 0) return 'error'; - return 'passed'; - }, - assert: function(expression) { - var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"'; - try { expression ? this.pass() : - this.fail(message); } - catch(e) { this.error(e); } - }, - assertEqual: function(expected, actual) { - var message = arguments[2] || "assertEqual"; - try { (expected == actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertInspect: function(expected, actual) { - var message = arguments[2] || "assertInspect"; - try { (expected == actual.inspect()) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertEnumEqual: function(expected, actual) { - var message = arguments[2] || "assertEnumEqual"; - try { $A(expected).length == $A(actual).length && - expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ? - this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + - ', actual ' + Test.Unit.inspect(actual)); } - catch(e) { this.error(e); } - }, - assertNotEqual: function(expected, actual) { - var message = arguments[2] || "assertNotEqual"; - try { (expected != actual) ? this.pass() : - this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertIdentical: function(expected, actual) { - var message = arguments[2] || "assertIdentical"; - try { (expected === actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertNotIdentical: function(expected, actual) { - var message = arguments[2] || "assertNotIdentical"; - try { !(expected === actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertNull: function(obj) { - var message = arguments[1] || 'assertNull' - try { (obj==null) ? this.pass() : - this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); } - catch(e) { this.error(e); } - }, - assertMatch: function(expected, actual) { - var message = arguments[2] || 'assertMatch'; - var regex = new RegExp(expected); - try { (regex.exec(actual)) ? this.pass() : - this.fail(message + ' : regex: "' + Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } - }, - assertHidden: function(element) { - var message = arguments[1] || 'assertHidden'; - this.assertEqual("none", element.style.display, message); - }, - assertNotNull: function(object) { - var message = arguments[1] || 'assertNotNull'; - this.assert(object != null, message); - }, - assertType: function(expected, actual) { - var message = arguments[2] || 'assertType'; - try { - (actual.constructor == expected) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + (actual.constructor) + '"'); } - catch(e) { this.error(e); } - }, - assertNotOfType: function(expected, actual) { - var message = arguments[2] || 'assertNotOfType'; - try { - (actual.constructor != expected) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + (actual.constructor) + '"'); } - catch(e) { this.error(e); } - }, - assertInstanceOf: function(expected, actual) { - var message = arguments[2] || 'assertInstanceOf'; - try { - (actual instanceof expected) ? this.pass() : - this.fail(message + ": object was not an instance of the expected type"); } - catch(e) { this.error(e); } - }, - assertNotInstanceOf: function(expected, actual) { - var message = arguments[2] || 'assertNotInstanceOf'; - try { - !(actual instanceof expected) ? this.pass() : - this.fail(message + ": object was an instance of the not expected type"); } - catch(e) { this.error(e); } - }, - assertRespondsTo: function(method, obj) { - var message = arguments[2] || 'assertRespondsTo'; - try { - (obj[method] && typeof obj[method] == 'function') ? this.pass() : - this.fail(message + ": object doesn't respond to [" + method + "]"); } - catch(e) { this.error(e); } - }, - assertReturnsTrue: function(method, obj) { - var message = arguments[2] || 'assertReturnsTrue'; - try { - var m = obj[method]; - if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; - m() ? this.pass() : - this.fail(message + ": method returned false"); } - catch(e) { this.error(e); } - }, - assertReturnsFalse: function(method, obj) { - var message = arguments[2] || 'assertReturnsFalse'; - try { - var m = obj[method]; - if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; - !m() ? this.pass() : - this.fail(message + ": method returned true"); } - catch(e) { this.error(e); } - }, - assertRaise: function(exceptionName, method) { - var message = arguments[2] || 'assertRaise'; - try { - method(); - this.fail(message + ": exception expected but none was raised"); } - catch(e) { - ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); - } - }, - assertElementsMatch: function() { - var expressions = $A(arguments), elements = $A(expressions.shift()); - if (elements.length != expressions.length) { - this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions'); - return false; - } - elements.zip(expressions).all(function(pair, index) { - var element = $(pair.first()), expression = pair.last(); - if (element.match(expression)) return true; - this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect()); - }.bind(this)) && this.pass(); - }, - assertElementMatches: function(element, expression) { - this.assertElementsMatch([element], expression); - }, - benchmark: function(operation, iterations) { - var startAt = new Date(); - (iterations || 1).times(operation); - var timeTaken = ((new Date())-startAt); - this.info((arguments[2] || 'Operation') + ' finished ' + - iterations + ' iterations in ' + (timeTaken/1000)+'s' ); - return timeTaken; - }, - _isVisible: function(element) { - element = $(element); - if(!element.parentNode) return true; - this.assertNotNull(element); - if(element.style && Element.getStyle(element, 'display') == 'none') - return false; - - return this._isVisible(element.parentNode); - }, - assertNotVisible: function(element) { - this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1])); - }, - assertVisible: function(element) { - this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1])); - }, - benchmark: function(operation, iterations) { - var startAt = new Date(); - (iterations || 1).times(operation); - var timeTaken = ((new Date())-startAt); - this.info((arguments[2] || 'Operation') + ' finished ' + - iterations + ' iterations in ' + (timeTaken/1000)+'s' ); - return timeTaken; - } -} - -Test.Unit.Testcase = Class.create(); -Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), { - initialize: function(name, test, setup, teardown) { - Test.Unit.Assertions.prototype.initialize.bind(this)(); - this.name = name; - - if(typeof test == 'string') { - test = test.gsub(/(\.should[^$]+\()/,'#{0}this,'); - test = test.gsub(/(\.should[^\(]+)\(this,$/,'#{1}(this)'); - this.test = function() { - eval('with(this){'+test+'}'); - } - } else { - this.test = test || function() {}; - } - - this.setup = setup || function() {}; - this.teardown = teardown || function() {}; - this.isWaiting = false; - this.timeToWait = 1000; - }, - wait: function(time, nextPart) { - this.isWaiting = true; - this.test = nextPart; - this.timeToWait = time; - }, - run: function() { - try { - try { - if (!this.isWaiting) this.setup.bind(this)(); - this.isWaiting = false; - this.test.bind(this)(); - } finally { - if(!this.isWaiting) { - this.teardown.bind(this)(); - } - } - } - catch(e) { this.error(e); } - } -}); - -// *EXPERIMENTAL* BDD-style testing to please non-technical folk -// This draws many ideas from RSpec http://rspec.rubyforge.org/ - -Test.setupBDDExtensionMethods = function(){ - var METHODMAP = { - shouldEqual: 'assertEqual', - shouldNotEqual: 'assertNotEqual', - shouldEqualEnum: 'assertEnumEqual', - shouldBeA: 'assertType', - shouldNotBeA: 'assertNotOfType', - shouldBeAn: 'assertType', - shouldNotBeAn: 'assertNotOfType', - shouldBeNull: 'assertNull', - shouldNotBeNull: 'assertNotNull', - - shouldBe: 'assertReturnsTrue', - shouldNotBe: 'assertReturnsFalse', - shouldRespondTo: 'assertRespondsTo' - }; - Test.BDDMethods = {}; - for(m in METHODMAP) { - Test.BDDMethods[m] = eval( - 'function(){'+ - 'var args = $A(arguments);'+ - 'var scope = args.shift();'+ - 'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }'); - } - [Array.prototype, String.prototype, Number.prototype].each( - function(p){ Object.extend(p, Test.BDDMethods) } - ); -} - -Test.context = function(name, spec, log){ - Test.setupBDDExtensionMethods(); - - var compiledSpec = {}; - var titles = {}; - for(specName in spec) { - switch(specName){ - case "setup": - case "teardown": - compiledSpec[specName] = spec[specName]; - break; - default: - var testName = 'test'+specName.gsub(/\s+/,'-').camelize(); - var body = spec[specName].toString().split('\n').slice(1); - if(/^\{/.test(body[0])) body = body.slice(1); - body.pop(); - body = body.map(function(statement){ - return statement.strip() - }); - compiledSpec[testName] = body.join('\n'); - titles[testName] = specName; - } - } - new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name }); -}; \ No newline at end of file Modified: trunk/theme/src/bin/test/theme-test-war/themes/style.css =================================================================== --- trunk/theme/src/bin/test/theme-test-war/themes/style.css 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/bin/test/theme-test-war/themes/style.css 2007-04-06 22:33:41 UTC (rev 6936) @@ -1,20 +1,26 @@ + div.test-region { + border: 0px; + margin:16px; width:512px; - padding:16px; + padding:0px; background-color:red; } div.test-window { - padding:16px; + border:1px solid black; + padding:15px; background-color:blue; } div.test-decoration { - height:32px; + border:1px solid black; + height:31px; background-color:green; } div.test-portlet { - height:128px; + border:1px solid black; + height:127px; background-color:yellow; } \ No newline at end of file Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -91,8 +91,8 @@ pageRenderCtx.setLayoutState(null); // - pageRenderCtx.getPageProperties().put(DynaConstants.JAVASCRIPT_BASE, "/portal-ajax"); - pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL, "http://localhost:8080/portal-ajax/ajax"); + pageRenderCtx.getPageProperties().put(DynaConstants.DYNA_RESOURCE_BASE_URL, request.getContextPath() + "/dyna"); + pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL, request.getContextPath()); // pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_THEME, theme.getThemeInfo().getName()); @@ -118,6 +118,8 @@ RenderContext renderCtx = layout.getRenderContext(markupInfo, dispatcher); + pageRenderCtx.getPageProperties().put(DynaConstants.OBJECT_ENABLED, "true"); + renderCtx.setAttribute(ThemeConstants.ATTR_THEME, theme); renderCtx.render(pageRenderCtx); Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -128,7 +128,7 @@ { // Map pageProps = new HashMap(); - pageProps.put(DynaConstants.JAVASCRIPT_BASE, "/portal-ajax"); + pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax"); pageProps.put(DynaConstants.ASYNC_SERVER_URL, "http://localhost:8080/portal-ajax/ajax"); // Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/servlet/TestThemeServlet.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -95,7 +95,7 @@ // Map pageProps = new HashMap(); - pageProps.put(DynaConstants.JAVASCRIPT_BASE, "/portal-ajax"); + pageProps.put(DynaConstants.DYNA_RESOURCE_BASE_URL, "/portal-ajax"); pageProps.put(DynaConstants.ASYNC_SERVER_URL, "http://localhost:8080/portal-ajax/ajax"); // Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -30,21 +30,18 @@ { /** . */ - public static final String JAVASCRIPT_BASE = "theme.ajax.js_base"; + public static final String DYNA_RESOURCE_BASE_URL = "theme.dyna.resource_base_url"; /** . */ - public static final String ASYNC_SERVER_URL = "theme.ajax.async_server_url"; + public static final String ASYNC_SERVER_URL = "theme.dyna.async_server_url"; /** . */ - public static final String OBJECT_ENABLED = "theme.ajax.object_enabled"; + public static final String OBJECT_ENABLED = "theme.dyna.object_enabled"; /** The id for view state. */ - public static final String VIEW_STATE = "theme.ajax.view_state"; + public static final String VIEW_STATE = "theme.dyna.view_state"; /** . */ -// public static final String AJAX_WINDOW_ENABLED = "ajax_window_enabled"; - - public static final String DYNA_RENDER_STATUS = "dyna_render_status"; } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -75,7 +75,7 @@ public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { PrintWriter markup = renderContext.getWriter(); - String jsBase = renderContext.getProperty(DynaConstants.JAVASCRIPT_BASE); + String jsBase = renderContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); String asyncServerURL = renderContext.getProperty(DynaConstants.ASYNC_SERVER_URL); String viewState = renderContext.getProperty(DynaConstants.VIEW_STATE); @@ -96,19 +96,19 @@ { markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/js/portal/prototype.js'></script>\n"); + markup.print("/prototype.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/js/portal/scriptaculous.js'></script>\n"); + markup.print("/scriptaculous.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/js/portal/effects.js'></script>\n"); + markup.print("/effects.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/js/portal/dragdrop.js'></script>\n"); + markup.print("/dragdrop.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/js/portal/dyna.js'></script>\n"); + markup.print("/dyna.js'></script>\n"); markup.print("<script type='text/javascript'>\n"); // Async server URL needed for callbacks @@ -161,7 +161,8 @@ delegate.renderHeader(renderContext, rrc); // We need height and width otherwise the region will not be usable when empty - markup.print("<div class=\"dyna-region\" style=\"height:200px;width=200px\" id=\""); +// markup.print("<div class=\"dyna-region\" style=\"min-height:10px\" id=\""); + markup.print("<div class=\"dyna-region\" id=\""); markup.print(rrc.getId()); markup.print("\">"); break; Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-06 16:50:47 UTC (rev 6935) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-06 22:33:41 UTC (rev 6936) @@ -28,6 +28,7 @@ import org.jboss.portal.theme.ThemeServiceInfo; import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.ThemeElement; +import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; import org.jboss.portal.theme.render.RenderContext; import javax.servlet.http.HttpServletRequest; @@ -75,7 +76,7 @@ */ public void doTag() throws JspException, IOException { - boolean trace = log.isTraceEnabled(); + JspWriter out = this.getJspContext().getOut(); // get page and region PageContext app = (PageContext)getJspContext(); @@ -86,6 +87,10 @@ PortalTheme theme = (PortalTheme)renderContext.getAttribute(ThemeConstants.ATTR_THEME); ThemeServiceInfo themeServer = (ThemeServiceInfo)renderContext.getAttribute(ThemeConstants.ATTR_THEME_SERVER); + // + String jsBase = renderContext.getProperty(DynaConstants.DYNA_RESOURCE_BASE_URL); + out.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n"); + // If no theme provided we use what may be on the tag if (theme == null && themeServer != null && themeName != null && themeName.length() > 0) { @@ -95,7 +100,6 @@ // if (theme != null) { - JspWriter out = this.getJspContext().getOut(); for (Iterator i = theme.getElements().iterator(); i.hasNext();) { ThemeElement el = (ThemeElement)i.next();

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits April 2007