You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/03/22 09:10:24 UTC
svn commit: r1736150 -
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
Author: lofwyr
Date: Tue Mar 22 08:10:24 2016
New Revision: 1736150
URL: http://svn.apache.org/viewvc?rev=1736150&view=rev
Log:
TOBAGO-1368: The standard theme will use Bootstrap
- readonly
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1736150&r1=1736149&r2=1736150&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java Tue Mar 22 08:10:24 2016
@@ -55,7 +55,8 @@ public class SelectManyShuttleRenderer e
}
final boolean hasLabel = select.hasLabel();
final List<SelectItem> items = SelectItemUtils.getItemList(facesContext, select);
- final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
+ final boolean disabled = !items.iterator().hasNext() || select.isDisabled();
+ final boolean readonly = select.isReadonly();
final String unselectedLabel = select.getUnselectedLabel();
if (unselectedLabel != null) {
@@ -71,6 +72,7 @@ public class SelectManyShuttleRenderer e
final String unselectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "unselected";
writer.writeIdAttribute(unselectedClientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
+ writer.writeAttribute(HtmlAttributes.READONLY, readonly);
// TODO tabIndex
writer.writeAttribute(HtmlAttributes.TABINDEX, select.getTabIndex());
@@ -89,10 +91,10 @@ public class SelectManyShuttleRenderer e
writer.writeClassAttribute(Classes.create(select, "toolBar"));
writer.startElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
- createButton(facesContext, component, writer, disabled, Icons.ANGLE_DOUBLE_RIGHT, "addAll");
- createButton(facesContext, component, writer, disabled, Icons.ANGLE_RIGHT, "add");
- createButton(facesContext, component, writer, disabled, Icons.ANGLE_LEFT, "remove");
- createButton(facesContext, component, writer, disabled, Icons.ANGLE_DOUBLE_LEFT, "removeAll");
+ createButton(facesContext, component, writer, disabled | readonly, Icons.ANGLE_DOUBLE_RIGHT, "addAll");
+ createButton(facesContext, component, writer, disabled | readonly, Icons.ANGLE_RIGHT, "add");
+ createButton(facesContext, component, writer, disabled | readonly, Icons.ANGLE_LEFT, "remove");
+ createButton(facesContext, component, writer, disabled | readonly, Icons.ANGLE_DOUBLE_LEFT, "removeAll");
writer.startElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
@@ -109,6 +111,7 @@ public class SelectManyShuttleRenderer e
writer.writeIdAttribute(selectedClientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
+ writer.writeAttribute(HtmlAttributes.READONLY, readonly);
writer.writeAttribute(HtmlAttributes.TABINDEX, select.getTabIndex());
writer.writeClassAttribute(Classes.create(select, "selected"), BootstrapClass.FORM_CONTROL);
writer.writeAttribute(HtmlAttributes.MULTIPLE, true);