Author: awiner
Date: Wed Oct 11 18:56:49 2006
New Revision: 463106
URL: http://svn.apache.org/viewvc?view=rev&rev=463106
Log:
Faces-major renderer for tr:poll. While in, rename the Javascript PollManager
Javascript to TrPollManager. Bug to be investigated - polls are not pausing
while dialog windows are up.
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
Removed:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PollRenderer.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Poll.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Poll.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
Modified:
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Poll.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Poll.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Poll.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Poll.xml
Wed Oct 11 18:56:49 2006
@@ -21,7 +21,7 @@
<renderer>
<component-family>org.apache.myfaces.trinidad.Poll</component-family>
<renderer-type>org.apache.myfaces.trinidad.Poll</renderer-type>
-
<renderer-class>org.apache.myfaces.trinidadinternal.renderkit.uix.PollRenderer</renderer-class>
+
<renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PollRenderer</renderer-class>
<renderer-extension>
<mfp:component-type>org.apache.myfaces.trinidad.CorePoll</mfp:component-type>
<mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java?view=auto&rev=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
(added)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
Wed Oct 11 18:56:49 2006
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2000-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+
+import java.io.IOException;
+
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.trinidad.bean.FacesBean;
+import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.UIXPoll;
+import org.apache.myfaces.trinidad.component.core.CorePoll;
+import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.event.PollEvent;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+
+
+/**
+ * @version $Name: $ ($Revision:
adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/desktop/PollRenderer.java#0
$) $Date: 10-nov-2005.18:55:33 $
+ * @author The Oracle ADF Faces Team
+ */
+public class PollRenderer extends XhtmlRenderer
+{
+ public PollRenderer()
+ {
+ super(CorePoll.TYPE);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void decode(FacesContext context, UIComponent component)
+ {
+ Map<String, String> parameters =
+ context.getExternalContext().getRequestParameterMap();
+
+ Object event = parameters.get(XhtmlConstants.EVENT_PARAM);
+ if (XhtmlConstants.POLL_EVENT.equals(event))
+ {
+ Object source = parameters.get(XhtmlConstants.SOURCE_PARAM);
+ String id = component.getClientId(context);
+
+ if (id.equals(source))
+ {
+ // This component always uses PPR (unless not supported at all)
+ PartialPageUtils.forcePartialRendering(context);
+
+ // And forcibly re-render ourselves - because that's how
+ // we get the poll re-started
+ RequestContext.getCurrentInstance().addPartialTarget(component);
+
+ UIXPoll poll = (UIXPoll) component;
+ (new PollEvent(component)).queue();
+ if (poll.isImmediate())
+ context.renderResponse();
+ }
+ }
+ }
+
+ @Override
+ protected void findTypeConstants(FacesBean.Type type)
+ {
+ super.findTypeConstants(type);
+ _intervalKey = type.findKey("interval");
+ }
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ @Override
+ protected void encodeAll(
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean) throws IOException
+ {
+ XhtmlUtils.addLib(context, rc, "PollManager()");
+ ResponseWriter rw = context.getResponseWriter();
+ rw.startElement("span", component);
+ renderId(context, component);
+ // A page should not auto-refresh while in screen-reader mode.
+ // So only render the setTimeout script if we are in auto-refresh mode.
+ if (_isAutoRefreshMode(rc))
+ {
+ _renderPollingScript(context, rc, component, bean);
+ }
+ else
+ {
+ _renderManualRefresh(context, rc, component, bean);
+ }
+ rw.endElement("span");
+ }
+
+
+ /**
+ * A page should not auto-refresh while in screen-reader mode.
+ * In this case, we create a button which when clicked will send the
+ * "poll" event. This is instead of the setTimeout javascript function,
+ * which we render when not in screen-reader mode.
+ */
+ private void _renderManualRefresh(
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
+ {
+ String elementID = getClientId(context, component);
+ boolean isPartial = PartialPageUtils.supportsPartialRendering(rc);
+ String onclick = _getScriptContents(rc, bean, elementID, isPartial, false);
+
+ CoreGoButton goButton = new CoreGoButton();
+ goButton.setOnclick(onclick);
+ goButton.setText(rc.getTranslatedString("af_poll.MANUAL"));
+
+ goButton.encodeBegin(context);
+ goButton.encodeEnd(context);
+ }
+
+ /**
+ * Renders a script which sends a 'poll' event after a timeout.
+ */
+ private void _renderPollingScript(
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
+ {
+ String elementID = getClientId(context, component);
+ boolean isPartial = PartialPageUtils.supportsPartialRendering(rc);
+ String buffer =
+ _getScriptContents(rc, bean, elementID, isPartial, true);
+
+ ResponseWriter rw = context.getResponseWriter();
+ rw.startElement("script", component);
+ renderScriptTypeAttribute(context, rc);
+ renderScriptDeferAttribute(context, rc);
+ rw.writeText(buffer, null);
+ rw.endElement("script");
+ }
+
+ protected int getInterval(FacesBean bean)
+ {
+ Object o = bean.getProperty(_intervalKey);
+ if (o == null)
+ {
+ o = _intervalKey.getDefault();
+ }
+
+ if (o instanceof Number)
+ return ((Number) o).intValue();
+
+ return _POLL_INTERVAL_DEFAULT;
+ }
+
+ /**
+ * returns a String which is the entire script to be rendered.
+ * extract the attributes of the poll element and build
+ * a script.
+ * the javascript function we build depends on whether the page is refreshed
+ * full or partially, and whether or not it is in a form and whether or
+ * not it should be auto-refreshed. For auto-refresh, then
+ * the script is a setTimeout script. For manual-refresh
+ * this will be the same script we render,
+ * but minus the setTimeout call. In manual-refresh mode
+ * the user will need to click on a button
+ * to send the 'poll' event
+ */
+ private String _getScriptContents(
+ RenderingContext rc,
+ FacesBean bean,
+ String elementID,
+ boolean isPartial,
+ boolean isAutoRefreshMode
+ )
+ {
+ // We will build a script like one of the following:
+ // (these examples assume isAutoRefreshMode is false,
+ // if isAutoRefreshMode is true, these commands are registered in the
+ // _TrPollManager javascript object, which will manage executing this
commands
+ // at the specified pollInterval.)
+ //
+ // Partial page refresh when the poll component is inside of a form:
+ //
"_submitPartialChange('formName',0,{event:'poll',source:'pollingWidgetId',
+ // partialTargets:'pollingWidgetId', partial='true'})")
+ // Full page refresh when the poll component is inside of a form:
+ // "submitForm('formName',0,{event:'poll', source:'pollingWidgetId'}),
+ // timeoutMS)
+ /* -------------------------------------------------------- */
+
+ // get variables needed to create the javascript function
+ int pollInterval = 0;
+ if (isAutoRefreshMode)
+ {
+ pollInterval = getInterval(bean);
+ }
+
+ if (rc.getFormData() == null)
+ {
+ _LOG.warning("The poll component must be inside of a form; " +
+ "disabling poll " + elementID);
+ return null;
+ }
+
+ String startScript = _getStartScript(isPartial,
+ isAutoRefreshMode,
+ elementID);
+ String argumentString = _getArgumentString(elementID,
+ rc.getFormData().getName(),
+ isPartial);
+ int length = _getScriptBufferLength(startScript,
+ argumentString,
+ pollInterval,
+ isAutoRefreshMode);
+
+ // build the script:
+ StringBuilder builder = new StringBuilder(length);
+
+ builder.append(startScript);
+
+ //pu: In manual-refresh mode, submit is through onclick of button, not an
+ // auto-scheduled command string, hence no escaping "'" in arguments.
+ if (_isAutoRefreshMode(rc))
+ {
+ builder.append(XhtmlUtils.escapeJS(argumentString));
+ }
+ else
+ {
+ builder.append(argumentString);
+ }
+
+ // auto-refresh is not allowed in accessible mode.
+ // So render the pollInterval portion only if in auto-refresh mode.
+ if (isAutoRefreshMode)
+ {
+ builder.append(_MIDDLE_SCRIPT_AUTO_REFRESH);
+ builder.append(pollInterval);
+ }
+
+ builder.append(_END_SCRIPT);
+
+ return builder.toString();
+ }
+
+
+ /**
+ * Computes the length of the buffer that is needed to build up the script
+ */
+ private static int _getScriptBufferLength(
+ String startScript,
+ String argumentString,
+ Integer pollInterval,
+ boolean isAutoRefreshMode
+ )
+ {
+ if ((startScript == null) || (argumentString == null))
+ {
+ return 0;
+ }
+
+ int length = startScript.length() +
+ argumentString.length() +
+ _MIDDLE_SCRIPT_AUTO_REFRESH.length() +
+ _END_SCRIPT.length();
+
+ if (isAutoRefreshMode && (pollInterval != null))
+ {
+ length += pollInterval.toString().length() + 3;
+ }
+
+ return length;
+ }
+
+ /**
+ * Returns the start script. The start script depends on whether the poll
+ * element is within a form and whether the page is in PPR mode and whether
+ * the page is in auto-refresh mode.
+ */
+ private static String _getStartScript(
+ boolean isPartial,
+ boolean isAutoRefreshMode,
+ String elementID
+ )
+ {
+ String startScript = "";
+ if (isAutoRefreshMode)
+ {
+ startScript = _PRE_START_SCRIPT_AUTO_REFRESH;
+ startScript += elementID;
+ startScript += "\", \"";
+ }
+
+ if (isPartial)
+ {
+ startScript += _START_SCRIPT_PARTIAL_FORM;
+ }
+ else
+ {
+ startScript += _START_SCRIPT_FULL_FORM;
+ }
+
+ return startScript;
+ }
+
+ /**
+ * Returns a String which will be used as the JavaScript arguments: either
+ * a URL with event information or the needed arguments to
+ * submitForm/_submitPartialChange.
+ * e.g., if within a form and PPR, the argument string is:
+ * 'myform',0,{event:'poll',source:'polling-widget'}",
+ */
+ private static String _getArgumentString(
+ String elementID,
+ String formName,
+ boolean isPartial
+ )
+ {
+
+ String argumentString = null;
+ StringBuilder buffer = new StringBuilder(60);
+ buffer.append("'");
+ buffer.append(formName);
+ // 0 means do not validate
+ buffer.append("',0,");
+ buffer.append("{" +
+ XhtmlConstants.EVENT_PARAM + ":\'" +
+ XhtmlConstants.POLL_EVENT + "\'," +
+ XhtmlConstants.SOURCE_PARAM + ":\'");
+ buffer.append(elementID);
+ buffer.append("\'}");
+ return buffer.toString();
+ }
+
+ /**
+ * return true if this element should poll automatically
+ * rather than manually.
+ */
+ private boolean _isAutoRefreshMode(
+ RenderingContext rc
+ )
+ {
+ // auto poll when NOT in screen-reader mode.
+ return (!isScreenReaderMode(rc));
+ }
+
+ private PropertyKey _intervalKey;
+
+ // script constants
+ // Script for initializing the auto mode for the command
+ private static final String _PRE_START_SCRIPT_AUTO_REFRESH =
+ " if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate(\"";
+
+ private static final String _START_SCRIPT_PARTIAL_FORM =
+ "_submitPartialChange(";
+ private static final String _START_SCRIPT_FULL_FORM =
+ "submitForm(";
+ private static final String _END_SCRIPT = ");";
+ private static final String _MIDDLE_SCRIPT_AUTO_REFRESH = ")\", ";
+
+ private static final int _POLL_INTERVAL_DEFAULT = 5000;
+
+ private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(PollRenderer.class);
+}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
Wed Oct 11 18:56:49 2006
@@ -55,6 +55,9 @@
// SortableHeader
public static final String SORT_EVENT = "sort";
+ // Poll
+ public static final String POLL_EVENT = "poll";
+
// Chart Drill down
public static final String CHART_DRILL_DOWN_EVENT = "chartDrillDown";
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
Wed Oct 11 18:56:49 2006
@@ -441,7 +441,6 @@
public static final String PAGE_NAVIGATION_PATH_NAME = "pageNavigationPath";
public static final String PAGE_MENU_TABS_NAME = "pageMenuTabs";
public static final String PAGE_NAVIGATION_TREE_NAME = "pageNavigationTree";
- public static final String POLL_NAME = "poll";
public static final String PROCESS_CHOICE_BAR_NAME = "processChoiceBar";
public static final String PROCESS_TRAIN_NAME = "processTrain";
public static final String PROCESSING_NAME = "processing";
@@ -1239,9 +1238,6 @@
public static final String LOV_FILTER_EVENT = "lovFilter";
public static final String LOV_SEARCH_TEXT = "searchText";
- // Processing refresh event
- // Event from the 'poll' element
- public static final String POLL_EVENT = "poll";
// Navigate event
public static final String NAVIGATE_EVENT = "navigate";
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
Wed Oct 11 18:56:49 2006
@@ -258,7 +258,6 @@
PAGE_NAVIGATION_PATH_NAME,
PAGE_MENU_TABS_NAME,
PAGE_NAVIGATION_TREE_NAME,
- POLL_NAME,
PROCESS_CHOICE_BAR_NAME,
PROCESS_TRAIN_NAME,
PROCESSING_NAME,
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Poll.js
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Poll.js?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Poll.js
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Poll.js
Wed Oct 11 18:56:49 2006
@@ -22,22 +22,19 @@
// 2. Add and activate a poll command.
// 3. Reactivate all the poll commands that were set earlier.
////////////////////////////////////////////////////////////////////////////////
-function _PollManager()
+function _TrPollManager()
{
this.pollIdList;
this.active = true;
}
-_PollManager.prototype.addAndActivate = _addAndActivatePoll;
-_PollManager.prototype.deactivateAll = _deactivateAllPoll;
-_PollManager.prototype.reactivateAll = _reactivateAllPoll;
// Adds a command (replaces one that already exists with the same poll id)
// and executes it right away.
-function _addAndActivatePoll(pollId, commandString, timeout)
+_TrPollManager.prototype.addAndActivate = function(pollId, commandString,
timeout)
{
if (!this.pollIdList)
this.pollIdList = new Array();
- this[pollId] = new _PollCommand(commandString, timeout, this.active);
+ this[pollId] = new _TrPollCommand(commandString, timeout, this.active);
idIndex = -1;
for (var i=0; i<this.pollIdList.length; i++)
{
@@ -58,7 +55,7 @@
}
// Deactivate all the registered poll commands.
-function _deactivateAllPoll()
+_TrPollManager.prototype.deactivateAll = function()
{
for (var i=0; i<this.pollIdList.length; i++)
{
@@ -68,7 +65,7 @@
}
// Reactivate all the registered poll commands.
-function _reactivateAllPoll()
+_TrPollManager.prototype.reactivateAll = function()
{
for (var i=0; i<this.pollIdList.length; i++)
{
@@ -80,16 +77,15 @@
////////////////////////////////////////////////////////////////////////////////
// Custom object representing a poll command.
////////////////////////////////////////////////////////////////////////////////
-function _PollCommand(commandString, timeout, activate)
+function _TrPollCommand(commandString, timeout, activate)
{
this.commandString = commandString;
this.timeout = timeout;
if (activate)
this.activate();
}
-_PollCommand.prototype.activate = _activatePoll;
-function _activatePoll()
+_TrPollCommand.prototype.activate = function()
{
this.commandId = setTimeout(this.commandString, this.timeout);
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
Wed Oct 11 18:56:49 2006
@@ -19,7 +19,6 @@
org.apache.myfaces.trinidad.component.UIXSelectRange|org.apache.myfaces.trinidad.ChoiceBar=org.apache.myfaces.trinidadinternal.bean.UIXEditableFacesBeanImpl
### Old "UIX" renderers and associated beans
org.apache.myfaces.trinidad.component.UIXCommand|org.apache.myfaces.trinidad.NavigationItem=org.apache.myfaces.trinidadinternal.uinode.nav.CommandNavigationItemFacesBean
-org.apache.myfaces.trinidad.component.UIXCommand|org.apache.myfaces.trinidad.Button=org.apache.myfaces.trinidadinternal.uinode.nav.CommandButtonFacesBean
org.apache.myfaces.trinidad.component.UIXSingleStep=org.apache.myfaces.trinidadinternal.uinode.nav.SingleStepFacesBean
org.apache.myfaces.trinidad.component.UIXProcess|org.apache.myfaces.trinidad.ChoiceBar=org.apache.myfaces.trinidadinternal.uinode.nav.ProcessChoiceBarFacesBean
org.apache.myfaces.trinidad.component.html.HtmlCellFormat=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
@@ -28,7 +27,6 @@
org.apache.myfaces.trinidad.component.html.HtmlScript=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.input.CoreChooseColor=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.CoreImportScript=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
-org.apache.myfaces.trinidad.component.core.CorePoll=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.CoreSubform=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.output.CoreLegend=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.layout.CorePanelPage=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
@@ -39,7 +37,6 @@
org.apache.myfaces.trinidad.component.core.layout.CorePanelSideBar=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.layout.CorePanelTip=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.nav.CorePage=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
-org.apache.myfaces.trinidad.component.core.input.CoreResetButton=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.UIXSelectMany|org.apache.myfaces.trinidad.Shuttle=org.apache.myfaces.trinidadinternal.uinode.EditableFacesBean
org.apache.myfaces.trinidad.component.UIXSelectOrder|org.apache.myfaces.trinidad.Shuttle=org.apache.myfaces.trinidadinternal.uinode.EditableFacesBean
org.apache.myfaces.trinidad.component.UIXShowOne|org.apache.myfaces.trinidad.Tab=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimal-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimal-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimal-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimal-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,48 +1,44 @@
-<results>
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'test-id\',\'partialTargets\':\'test-id\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
7000);
- </script>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'test-id\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 7000);
+ </script>
+ </span>
+</results>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIE-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIE-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIE-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIE-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,48 +1,44 @@
-<results>
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'test-id\',\'partialTargets\':\'test-id\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
7000);
- </script>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'test-id\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 7000);
+ </script>
+ </span>
+</results>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIERtl-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIERtl-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIERtl-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalIERtl-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,48 +1,44 @@
-<results>
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'test-id\',\'partialTargets\':\'test-id\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
7000);
- </script>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'test-id\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 7000);
+ </script>
+ </span>
+</results>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalInacc-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalInacc-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalInacc-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalInacc-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,48 +1,44 @@
-<results>
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'test-id\',\'partialTargets\':\'test-id\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
7000);
- </script>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'test-id\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 7000);
+ </script>
+ </span>
+</results>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalSaf-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalSaf-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalSaf-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalSaf-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,48 +1,44 @@
-<results>
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'test-id\',\'partialTargets\':\'test-id\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
5000);
- </script>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <script
- language="javascript"
- >
- _pprUpdateMode=true; if (!self._pollManager) _pollManager = new
_PollManager(); _pollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{\'event\':\'poll\',\'source\':\'mainId\',\'partialTargets\':\'mainId\',\'partial\':\'true\'})",
7000);
- </script>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("test-id",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'test-id\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 5000);
+ </script>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <script
+ >
+ if (!self._trPollManager) _trPollManager = new _TrPollManager();
_trPollManager.addAndActivate("mainId",
"_submitPartialChange(\'formId\',0,{event:\'poll\',source:\'mainId\'})", 7000);
+ </script>
+ </span>
+</results>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml?view=diff&rev=463106&r1=463105&r2=463106
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
Wed Oct 11 18:56:49 2006
@@ -1,60 +1,56 @@
-<results>
- <span
- id="mainId"
- >
-
- <button
- class="OraLink"
-
onclick="_pprUpdateMode=true;_submitPartialChange('formId',0,{'event':'poll','source':'mainId','partialTargets':'mainId','partial':'true'});"
- title="Poll Server"
- type="button"
- >
- Poll Server
- </button>
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
-
- <button
- class="OraLink"
-
onclick="_pprUpdateMode=true;_submitPartialChange('formId',0,{'event':'poll','source':'test-id','partialTargets':'test-id','partial':'true'});"
- title="Poll Server"
- type="button"
- >
- Poll Server
- </button>
- </span>
-<!--AttributeTest[interval,5000]-->
-
- <span
- id="mainId"
- >
-
- <button
- class="OraLink"
-
onclick="_pprUpdateMode=true;_submitPartialChange('formId',0,{'event':'poll','source':'mainId','partialTargets':'mainId','partial':'true'});"
- title="Poll Server"
- type="button"
- >
- Poll Server
- </button>
- </span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <button
- class="OraLink"
-
onclick="_pprUpdateMode=true;_submitPartialChange('formId',0,{'event':'poll','source':'mainId','partialTargets':'mainId','partial':'true'});"
- title="Poll Server"
- type="button"
- >
- Poll Server
- </button>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+
+ <button
+ class="af_goButton"
+
onclick="_submitPartialChange('formId',0,{event:'poll',source:'mainId'});"
+ type="button"
+ >
+ Poll Server
+ </button>
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+
+ <button
+ class="af_goButton"
+
onclick="_submitPartialChange('formId',0,{event:'poll',source:'test-id'});"
+ type="button"
+ >
+ Poll Server
+ </button>
+ </span>
+<!--AttributeTest[interval,5000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <button
+ class="af_goButton"
+
onclick="_submitPartialChange('formId',0,{event:'poll',source:'mainId'});"
+ type="button"
+ >
+ Poll Server
+ </button>
+ </span>
+<!--AttributeTest[interval,7000]-->
+
+ <span
+ id="mainId"
+ >
+
+ <button
+ class="af_goButton"
+
onclick="_submitPartialChange('formId',0,{event:'poll',source:'mainId'});"
+ type="button"
+ >
+ Poll Server
+ </button>
+ </span>
+</results>
