You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/08/17 14:17:01 UTC
svn commit: r1805292 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
Author: hnoeth
Date: Thu Aug 17 14:17:01 2017
New Revision: 1805292
URL: http://svn.apache.org/viewvc?rev=1805292&view=rev
Log:
TOBAGO-1783 Field is not focussed when the label is clicked
* for attribute of label now contain the ID of the field, if possible
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java Thu Aug 17 14:17:01 2017
@@ -206,4 +206,10 @@ public class FileRenderer extends Messag
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final AbstractUIFile file = (AbstractUIFile) component;
+ return file.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Thu Aug 17 14:17:01 2017
@@ -210,4 +210,10 @@ public class InRenderer extends MessageL
final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUIInput input)
throws IOException {
}
+
+ @Override
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
+ final AbstractUIInput input = (AbstractUIInput) component;
+ return input.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java Thu Aug 17 14:17:01 2017
@@ -167,16 +167,16 @@ public abstract class LabelLayoutRendere
break;
case segmentLeft:
if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentLeft) {
- encodeLabel(component, writer, labelLayout);
+ encodeLabel(facesContext, component, writer, labelLayout);
}
break;
case segmentRight:
if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentRight) {
- encodeLabel(component, writer, labelLayout);
+ encodeLabel(facesContext, component, writer, labelLayout);
}
break;
default:
- encodeLabel(component, writer, labelLayout);
+ encodeLabel(facesContext, component, writer, labelLayout);
}
}
@@ -193,7 +193,7 @@ public abstract class LabelLayoutRendere
break;
case flexRight:
case flowRight:
- encodeLabel(component, writer, labelLayout);
+ encodeLabel(facesContext, component, writer, labelLayout);
break;
default:
// nothing to do
@@ -202,13 +202,14 @@ public abstract class LabelLayoutRendere
writer.endElement(HtmlElements.DIV);
}
- protected void encodeLabel(UIComponent component, TobagoResponseWriter writer, LabelLayout labelLayout)
+ protected void encodeLabel(final FacesContext facesContext, final UIComponent component,
+ final TobagoResponseWriter writer, final LabelLayout labelLayout)
throws IOException {
// TBD: maybe use an interface for getLabel()
final String label = ComponentUtils.getStringAttribute(component, Attributes.label);
if (StringUtils.isNotBlank(label)) {
writer.startElement(HtmlElements.LABEL);
- writer.writeAttribute(HtmlAttributes.FOR, component.getClientId(), false);
+ writer.writeAttribute(HtmlAttributes.FOR, getFieldId(facesContext, component), false);
writer.writeClassAttribute(TobagoClass.LABEL, BootstrapClass.COL_FORM_LABEL);
if (component instanceof SupportsAccessKey) {
LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey((SupportsAccessKey) component);
@@ -226,4 +227,5 @@ public abstract class LabelLayoutRendere
: LabelLayout.skip;
}
+ protected abstract String getFieldId(final FacesContext facesContext, final UIComponent component);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java Thu Aug 17 14:17:01 2017
@@ -104,4 +104,9 @@ public class OutRenderer extends Message
writer.endElement(HtmlElements.SPAN);
}
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ return component.getClientId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java Thu Aug 17 14:17:01 2017
@@ -145,4 +145,10 @@ public class SelectBooleanCheckboxRender
protected CssItem[] getCssItems(final FacesContext facesContext, final AbstractUISelectBooleanCheckbox select) {
return null;
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final AbstractUISelectBooleanCheckbox select = (AbstractUISelectBooleanCheckbox) component;
+ return select.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java Thu Aug 17 14:17:01 2017
@@ -141,4 +141,9 @@ public class SelectManyCheckboxRenderer
protected CssItem[] getCssItems(final FacesContext facesContext, final AbstractUISelectManyCheckbox select) {
return null;
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ return component.getClientId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java Thu Aug 17 14:17:01 2017
@@ -91,4 +91,10 @@ public class SelectManyListboxRenderer e
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final UISelectManyListbox select = (UISelectManyListbox) component;
+ return select.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java Thu Aug 17 14:17:01 2017
@@ -162,4 +162,9 @@ public class SelectManyShuttleRenderer e
writer.writeIcon(icon);
writer.endElement(HtmlElements.BUTTON);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ return component.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "unselected";
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java Thu Aug 17 14:17:01 2017
@@ -83,4 +83,10 @@ public class SelectOneChoiceRenderer ext
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final UISelectOneChoice select = (UISelectOneChoice) component;
+ return select.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java Thu Aug 17 14:17:01 2017
@@ -87,4 +87,10 @@ public class SelectOneListboxRenderer ex
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final UISelectOneListbox select = (UISelectOneListbox) component;
+ return select.getFieldId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java Thu Aug 17 14:17:01 2017
@@ -152,4 +152,9 @@ public class SelectOneRadioRenderer exte
protected CssItem[] getCssItems(final FacesContext facesContext, final AbstractUISelectOneRadio select) {
return null;
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ return component.getClientId(facesContext);
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java?rev=1805292&r1=1805291&r2=1805292&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java Thu Aug 17 14:17:01 2017
@@ -165,4 +165,10 @@ public class TextareaRenderer extends Me
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.TEXTAREA);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ final UITextarea input = (UITextarea) component;
+ return input.getFieldId(facesContext);
+ }
}