You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/26 18:26:07 UTC
svn commit: r468081 [1/3] - in
/incubator/adffaces/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
main/resources/META-INF/agent/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
Author: awiner
Date: Thu Oct 26 11:26:04 2006
New Revision: 468081
URL: http://svn.apache.org/viewvc?view=rev&rev=468081
Log:
ADFFACES-242: button does not display on Pocket IE and IE Mobile. Commit tweaked version of patch from Piyush Hari.
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/singleStepButtonBar-minimalPPC-golden.xml
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java Thu Oct 26 11:26:04 2006
@@ -1,284 +1,280 @@
-/*
- * Copyright 2005,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.Collections;
-import java.util.List;
-
-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.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidad.context.RenderingContext;
-
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-
-/**
- * FIXME: the inheritance hierarchy is a bit annoying: should
- * we extend CommandButtonRenderer or GoLinkRenderer? Either
- * way, there's a fair bit of duplicated code
- */
-public class GoButtonRenderer extends GoLinkRenderer
-{
- public GoButtonRenderer()
- {
- this(CoreGoButton.TYPE);
- }
-
- protected GoButtonRenderer(FacesBean.Type type)
- {
- super(type);
- }
-
-
- @Override
- public boolean getRendersChildren()
- {
- return true;
- }
-
- @Override
- protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
- {
- String clientId = component.getClientId(context);
- // Make sure we don't have anything to save
- assert(arc.getCurrentClientId() == null);
- arc.setCurrentClientId(clientId);
-
- boolean useButtonTag = useButtonTags(arc);
- String element = useButtonTag ? "button" : "a";
- ResponseWriter rw = context.getResponseWriter();
- rw.startElement(element, component);
- renderId(context, component);
- boolean disabled = getDisabled(bean);
- if (useButtonTag)
- {
- rw.writeAttribute("type", "button", null);
- if (disabled)
- rw.writeAttribute("disabled", Boolean.TRUE, "disabled");
- }
- else
- {
- renderEncodedActionURI(context, "href", getDestination(bean));
- }
-
- if (disabled || !supportsNavigation(arc))
- {
- // Skip over event attributes when disabled
- renderStyleAttributes(context, arc, bean);
- }
- else
- {
- renderAllAttributes(context, arc, bean);
- if (useButtonTag)
- {
- rw.writeAttribute("onclick", getButtonOnclick(bean), null);
- }
- else
- {
- renderEncodedActionURI(context, "href", getDestination(bean));
- if (!Boolean.FALSE.equals(arc.getAgent().getCapabilities().get(
- TrinidadAgent.CAP_TARGET)))
- {
- rw.writeAttribute("target", getTargetFrame(bean), null);
- }
- }
- }
-
- // Write the text and access key
- String text = getText(bean);
- char accessKey;
- if (supportsAccessKeys(arc))
- {
- accessKey = getAccessKey(bean);
- if (accessKey != CHAR_UNDEFINED)
- {
- rw.writeAttribute("accesskey",
- new Character(accessKey),
- "accessKey");
- }
- }
- else
- {
- accessKey = CHAR_UNDEFINED;
- }
-
- AccessKeyUtils.renderAccessKeyText(context,
- getText(bean),
- accessKey,
- SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
-
- rw.endElement(element);
- }
-
-
- protected boolean useButtonTags(RenderingContext arc)
- {
- return (supportsScripting(arc) &&
- supportsAdvancedForms(arc) &&
- supportsIntrinsicEvents(arc));
-
- }
-
- /**
- * Override to return any state-based (selected, disabled, etc.)
- * CSS style markers. HINT: use an immutable, cached List<String>
- * for better performance.
- */
- protected List<String> getStateStyleClasses(
- FacesContext context,
- RenderingContext arc,
- FacesBean bean)
- {
- if (getDisabled(bean))
- return _DISABLED_STATE_LIST;
- return null;
- }
-
- // FIXME: move this implementation to XhtmlRenderer
- protected void renderStyleAttributes(
- FacesContext context,
- RenderingContext arc,
- FacesBean bean,
- String defaultStyleClass) throws IOException
- {
- String styleClass = getStyleClass(bean);
- String inlineStyle = getInlineStyle(bean);
- List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
-
- if ((styleClass==null) &&
- (defaultStyleClass != null) &&
- (stateStyleClasses == null))
- {
- renderStyleClass(context, arc, defaultStyleClass);
- }
- else
- {
- int numStates = ((stateStyleClasses != null) ?
- stateStyleClasses.size() : 0);
- int numClasses = ((styleClass != null) ? 1 : 0) +
- ((defaultStyleClass != null) ? 1 : 0) +
- numStates;
- if (numClasses > 0)
- {
- // set all the styleClasses in one array so we can pass it to
- // renderStyleClasses
- String[] styleClasses = new String[numClasses];
-
- int i=0;
- if (styleClass != null)
- styleClasses[i++] = styleClass;
- if (defaultStyleClass != null)
- styleClasses[i++] = defaultStyleClass;
-
- for (int j=0; j < numStates; j++, i++)
- {
- styleClasses[i] = stateStyleClasses.get(j);
- }
-
- renderStyleClasses(context, arc, styleClasses);
- }
- }
-
- String style = getInlineStyle(bean);
- if (style != null)
- {
- context.getResponseWriter().writeAttribute("style",
- style,
- "inlineStyle");
- }
- }
-
- @Override
- protected String getOnclick(FacesBean bean)
- {
- return null;
- }
-
- protected String getButtonOnclick(FacesBean bean)
- {
- String base = super.getOnclick(bean);
- String destination = getDestination(bean);
- if (destination == null)
- return base;
-
- destination = FacesContext.getCurrentInstance().
- getExternalContext().encodeActionURL(destination);
- String onclickJS = null;
-
- if ((destination.length()) > 11 &&
- "javascript:".equalsIgnoreCase(destination.substring(0,11)))
- {
- onclickJS = destination.substring(11);
- }
- else
- {
- // Escape the destination in case there's any quotes
- destination = destination.replace("'", "\\'");
-
- String targetFrame = getTargetFrame(bean);
- // Look for target frames with well-known names, like
- // _self, _top, _parent, _blank, and _new. (_new
- // is actually non-standard, but often used for _blank)
- if (targetFrame != null && !"_self".equals(targetFrame))
- {
- if ("_top".equals(targetFrame))
- {
- onclickJS = "top.location='" + destination + "'";
- }
- else if ("_parent".equals(targetFrame))
- {
- onclickJS = "parent.location='" + destination + "'";
- }
- else if ("_blank".equals(targetFrame) || "_new".equals(targetFrame))
- {
- onclickJS = "window.open('" + destination + "')";
- }
- else
- {
- onclickJS = "top[" +
- targetFrame +
- "].location='" +
- destination +
- "'";
- }
- }
- else
- {
- onclickJS = "document.location='" + destination + "'";
- }
- }
-
- return XhtmlUtils.getChainedJS(base, onclickJS, true);
- }
-
- protected String getDefaultStyleClass(FacesBean bean)
- {
- return SkinSelectors.AF_GO_BUTTON_STYLE_CLASS;
- }
-
- static private final List<String> _DISABLED_STATE_LIST =
- Collections.singletonList(SkinSelectors.STATE_DISABLED);
-}
+/*
+ * Copyright 2005,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.Collections;
+import java.util.List;
+
+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.core.nav.CoreGoButton;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+
+/**
+ * FIXME: the inheritance hierarchy is a bit annoying: should
+ * we extend CommandButtonRenderer or GoLinkRenderer? Either
+ * way, there's a fair bit of duplicated code
+ */
+public class GoButtonRenderer extends GoLinkRenderer
+{
+ public GoButtonRenderer()
+ {
+ this(CoreGoButton.TYPE);
+ }
+
+ protected GoButtonRenderer(FacesBean.Type type)
+ {
+ super(type);
+ }
+
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ @Override
+ protected void encodeAll(
+ FacesContext context,
+ RenderingContext arc,
+ UIComponent component,
+ FacesBean bean) throws IOException
+ {
+ String clientId = component.getClientId(context);
+ // Make sure we don't have anything to save
+ assert(arc.getCurrentClientId() == null);
+ arc.setCurrentClientId(clientId);
+
+ boolean useButtonTag = useButtonTags(arc);
+ String element = useButtonTag ? "button" : "a";
+ ResponseWriter rw = context.getResponseWriter();
+ rw.startElement(element, component);
+ renderId(context, component);
+ boolean disabled = getDisabled(bean);
+ if (useButtonTag)
+ {
+ rw.writeAttribute("type", "button", null);
+ if (disabled)
+ rw.writeAttribute("disabled", Boolean.TRUE, "disabled");
+ }
+ else
+ {
+ renderEncodedActionURI(context, "href", getDestination(bean));
+ }
+
+ if (disabled || !supportsNavigation(arc))
+ {
+ // Skip over event attributes when disabled
+ renderStyleAttributes(context, arc, bean);
+ }
+ else
+ {
+ renderAllAttributes(context, arc, bean);
+ if (useButtonTag)
+ {
+ rw.writeAttribute("onclick", getButtonOnclick(bean), null);
+ }
+ else
+ {
+ if (supportsTarget(arc))
+ {
+ rw.writeAttribute("target", getTargetFrame(bean), null);
+ }
+ }
+ }
+
+ // Write the text and access key
+ String text = getText(bean);
+ char accessKey;
+ if (supportsAccessKeys(arc))
+ {
+ accessKey = getAccessKey(bean);
+ if (accessKey != CHAR_UNDEFINED)
+ {
+ rw.writeAttribute("accesskey",
+ new Character(accessKey),
+ "accessKey");
+ }
+ }
+ else
+ {
+ accessKey = CHAR_UNDEFINED;
+ }
+
+ AccessKeyUtils.renderAccessKeyText(context,
+ getText(bean),
+ accessKey,
+ SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
+
+ rw.endElement(element);
+ }
+
+
+ protected boolean useButtonTags(RenderingContext arc)
+ {
+ return (supportsScripting(arc) &&
+ supportsAdvancedForms(arc) &&
+ supportsIntrinsicEvents(arc));
+
+ }
+
+ /**
+ * Override to return any state-based (selected, disabled, etc.)
+ * CSS style markers. HINT: use an immutable, cached List<String>
+ * for better performance.
+ */
+ protected List<String> getStateStyleClasses(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean)
+ {
+ if (getDisabled(bean))
+ return _DISABLED_STATE_LIST;
+ return null;
+ }
+
+ // FIXME: move this implementation to XhtmlRenderer
+ protected void renderStyleAttributes(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean,
+ String defaultStyleClass) throws IOException
+ {
+ String styleClass = getStyleClass(bean);
+ String inlineStyle = getInlineStyle(bean);
+ List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
+
+ if ((styleClass==null) &&
+ (defaultStyleClass != null) &&
+ (stateStyleClasses == null))
+ {
+ renderStyleClass(context, arc, defaultStyleClass);
+ }
+ else
+ {
+ int numStates = ((stateStyleClasses != null) ?
+ stateStyleClasses.size() : 0);
+ int numClasses = ((styleClass != null) ? 1 : 0) +
+ ((defaultStyleClass != null) ? 1 : 0) +
+ numStates;
+ if (numClasses > 0)
+ {
+ // set all the styleClasses in one array so we can pass it to
+ // renderStyleClasses
+ String[] styleClasses = new String[numClasses];
+
+ int i=0;
+ if (styleClass != null)
+ styleClasses[i++] = styleClass;
+ if (defaultStyleClass != null)
+ styleClasses[i++] = defaultStyleClass;
+
+ for (int j=0; j < numStates; j++, i++)
+ {
+ styleClasses[i] = stateStyleClasses.get(j);
+ }
+
+ renderStyleClasses(context, arc, styleClasses);
+ }
+ }
+
+ String style = getInlineStyle(bean);
+ if (style != null)
+ {
+ context.getResponseWriter().writeAttribute("style",
+ style,
+ "inlineStyle");
+ }
+ }
+
+ @Override
+ protected String getOnclick(FacesBean bean)
+ {
+ return null;
+ }
+
+ protected String getButtonOnclick(FacesBean bean)
+ {
+ String base = super.getOnclick(bean);
+ String destination = getDestination(bean);
+ if (destination == null)
+ return base;
+
+ destination = FacesContext.getCurrentInstance().
+ getExternalContext().encodeActionURL(destination);
+ String onclickJS = null;
+
+ if ((destination.length()) > 11 &&
+ "javascript:".equalsIgnoreCase(destination.substring(0,11)))
+ {
+ onclickJS = destination.substring(11);
+ }
+ else
+ {
+ // Escape the destination in case there's any quotes
+ destination = destination.replace("'", "\\'");
+
+ String targetFrame = getTargetFrame(bean);
+ // Look for target frames with well-known names, like
+ // _self, _top, _parent, _blank, and _new. (_new
+ // is actually non-standard, but often used for _blank)
+ if (targetFrame != null && !"_self".equals(targetFrame))
+ {
+ if ("_top".equals(targetFrame))
+ {
+ onclickJS = "top.location='" + destination + "'";
+ }
+ else if ("_parent".equals(targetFrame))
+ {
+ onclickJS = "parent.location='" + destination + "'";
+ }
+ else if ("_blank".equals(targetFrame) || "_new".equals(targetFrame))
+ {
+ onclickJS = "window.open('" + destination + "')";
+ }
+ else
+ {
+ onclickJS = "top[" +
+ targetFrame +
+ "].location='" +
+ destination +
+ "'";
+ }
+ }
+ else
+ {
+ onclickJS = "document.location='" + destination + "'";
+ }
+ }
+
+ return XhtmlUtils.getChainedJS(base, onclickJS, true);
+ }
+
+ protected String getDefaultStyleClass(FacesBean bean)
+ {
+ return SkinSelectors.AF_GO_BUTTON_STYLE_CLASS;
+ }
+
+ static private final List<String> _DISABLED_STATE_LIST =
+ Collections.singletonList(SkinSelectors.STATE_DISABLED);
+}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Thu Oct 26 11:26:04 2006
@@ -1010,13 +1010,20 @@
{
_renderSpace(rw);
}
- rw.startElement("button", null);
+ //The button html element is not supported on all browsers; use "input"
+ //if it is not
+ boolean useButtonTag = supportsAdvancedForms(arc);
+ String element = useButtonTag ? "button" : "input";
+
+ rw.startElement(element, null);
renderStyleClass(context, arc,
SkinSelectors.AF_NAVIGATION_LEVEL_CHOICE_BUTTON_STYLE_CLASS);
String goText = arc.getSkin().getTranslatedString(
arc.getLocaleContext(),
_GO_BUTTON_LABEL_KEY);
+ rw.writeAttribute("type", useButtonTag ? "button" : "submit", null);
+
// The onclick handler will evaluate the value of the selected option:
rw.writeAttribute(
"onclick",
@@ -1025,14 +1032,23 @@
"'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;",
null);
- rw.write(goText);
- rw.endElement("button");
+ if (useButtonTag)
+ {
+ rw.write(goText);
+ }
+ else
+ {
+ rw.writeAttribute("value", goText, "text");
+ }
+
+ rw.endElement(element);
+
if (isRtl)
{
_renderSpace(rw);
}
}
-
+
private void _renderSpace(
ResponseWriter rw
) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml Thu Oct 26 11:26:04 2006
@@ -17,7 +17,8 @@
<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
<capability name="dom" value="form"/>
<capability name="tables" value="advanced"/>
- <capability name="-adfinternal-advancedForms" value="true"/>
+ <!--PH:pocket IE do not support advanced forms-->
+ <capability name="-adfinternal-advancedForms" value="false"/>
<capability name="-adfinternal-intrinsicEvents" value="true"/>
<capability name="-adfinternal-disabledFormElements" value="false"/>
<capability name="-adfinternal-readonlyFormElements" value="false"/>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml Thu Oct 26 11:26:04 2006
@@ -1,290 +1,315 @@
<results>
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[accessKey,u]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[disabled,false]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[disabled,true]-->
- <button
+ <input
class="af_commandButton p_AFDisabled"
disabled="disabled"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[immediate,false]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[immediate,true]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',0,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[partialSubmit,false]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[partialSubmit,true]-->
<script
>
var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
</script>
- <button
+ <input
class="af_commandButton"
onclick="_adfspu('formId',1,0,'mainId');return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[textAndAccessKey,B&uttonText]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[windowHeight,100]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[windowWidth,200]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[id,myid]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'myid'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:myid"
name="uri-attr:myid"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[inlineStyle,background-color:red]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
style="background-color:red"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[shortDesc,my button]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
title="my button"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[styleClass,mystyle]-->
- <button
+ <input
class="mystyle af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onclick,null]-->
- <button
+ <input
class="af_commandButton"
onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[ondblclick,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
ondblclick="test-ondblclick"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onkeydown,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onkeydown="test-onkeydown"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onkeypress,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onkeypress="test-onkeypress"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onkeyup,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onkeyup="test-onkeyup"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onmousedown,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onmousedown="test-onmousedown"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onmousemove,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onmousemove="test-onmousemove"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onmouseout,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onmouseout="test-onmouseout"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onmouseover,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onmouseover="test-onmouseover"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
<!--AttributeTest[onmouseup,null]-->
- <button
+ <input
class="af_commandButton"
onclick="submitForm('formId',1,{source:'mainId'});return false;"
onmouseup="test-onmouseup"
- type="button"
+ type="submit"
+ value="ButtonText"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
- ButtonText
- </button>
+
+ </input>
</results>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml Thu Oct 26 11:26:04 2006
@@ -1,254 +1,232 @@
<results>
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[accessKey,u]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[disabled,false]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[disabled,true]-->
- <button
+ <a
class="af_goButton p_AFDisabled"
- disabled="disabled"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[longDesc,my long desc]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[targetFrame,mytarget]-->
- <button
+ <a
class="af_goButton"
- onclick="top[mytarget].location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[textAndAccessKey,B&uttonText]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[id,myid]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:myid"
name="uri-attr:myid"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[shortDesc,my button]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
title="my button"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[styleClass,mystyle]-->
- <button
+ <a
class="mystyle af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onblur,null]-->
- <button
+ <a
class="af_goButton"
onblur="test-onblur"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onclick,null]-->
- <button
+ <a
class="af_goButton"
- onclick="return _chain('test-onclick','document.location=\'encoded-action-url:http://www.oracle.com\'',this,event,true)"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[ondblclick,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
ondblclick="test-ondblclick"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onfocus,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onfocus="test-onfocus"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onkeydown,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onkeydown="test-onkeydown"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onkeypress,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onkeypress="test-onkeypress"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onkeyup,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onkeyup="test-onkeyup"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onmousedown,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onmousedown="test-onmousedown"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onmousemove,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onmousemove="test-onmousemove"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onmouseout,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onmouseout="test-onmouseout"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onmouseover,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onmouseover="test-onmouseover"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
<!--AttributeTest[onmouseup,null]-->
- <button
+ <a
class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
onmouseup="test-onmouseup"
- type="button"
+ href="uri-attr:encoded-action-url:http://www.oracle.com"
id="uri-attr:mainId"
name="uri-attr:mainId"
>
ButtonText
- </button>
+ </a>
</results>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimal-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimal-golden.xml Thu Oct 26 11:26:04 2006
@@ -39,6 +39,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -85,6 +86,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -132,6 +134,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -188,6 +191,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -234,6 +238,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('myid_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -291,6 +296,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -337,6 +343,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -384,6 +391,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -431,6 +439,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -478,6 +487,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -525,6 +535,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -572,6 +583,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -619,6 +631,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -666,6 +679,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -713,6 +727,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -760,6 +775,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -807,6 +823,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIE-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIE-golden.xml Thu Oct 26 11:26:04 2006
@@ -39,6 +39,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -85,6 +86,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -132,6 +134,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -188,6 +191,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -234,6 +238,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('myid_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -291,6 +296,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -337,6 +343,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -384,6 +391,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -431,6 +439,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -478,6 +487,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -525,6 +535,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -572,6 +583,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -619,6 +631,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -666,6 +679,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -713,6 +727,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -760,6 +775,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -807,6 +823,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIERtl-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIERtl-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalIERtl-golden.xml Thu Oct 26 11:26:04 2006
@@ -7,6 +7,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -45,6 +46,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -64,6 +66,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -102,6 +105,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -121,6 +125,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -160,6 +165,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -179,6 +185,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -227,6 +234,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -246,6 +254,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('myid_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -284,6 +293,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('myid_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -304,6 +314,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -352,6 +363,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -371,6 +383,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -409,6 +422,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -429,6 +443,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -467,6 +482,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -487,6 +503,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -525,6 +542,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -545,6 +563,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -583,6 +602,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -603,6 +623,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -641,6 +662,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -661,6 +683,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -699,6 +722,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -719,6 +743,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -757,6 +782,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -777,6 +803,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -815,6 +842,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -835,6 +863,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -873,6 +902,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -893,6 +923,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -931,6 +962,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -951,6 +983,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -989,6 +1022,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalInacc-golden.xml?view=diff&rev=468081&r1=468080&r2=468081
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalInacc-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneChoice-minimalInacc-golden.xml Thu Oct 26 11:26:04 2006
@@ -39,6 +39,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -85,6 +86,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -132,6 +134,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -188,6 +191,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -234,6 +238,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('myid_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -291,6 +296,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -337,6 +343,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -384,6 +391,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -431,6 +439,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -478,6 +487,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -525,6 +535,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -572,6 +583,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -619,6 +631,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -666,6 +679,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -713,6 +727,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -760,6 +775,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>
@@ -807,6 +823,7 @@
<button
class="af_navigationPane_choice-button"
onclick="var navLevelSelect = document.getElementById('mainId_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ type="button"
>
Go
</button>