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 2009/11/10 11:00:28 UTC
svn commit: r834408 -
/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
Author: lofwyr
Date: Tue Nov 10 10:00:28 2009
New Revision: 834408
URL: http://svn.apache.org/viewvc?rev=834408&view=rev
Log:
TOBAGO-821: SelectOneListbox "disabled" when no items, or readonly
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?rev=834408&r1=834407&r2=834408&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Tue Nov 10 10:00:28 2009
@@ -17,11 +17,6 @@
* limitations under the License.
*/
-/*
- * Created 07.02.2003 16:00:00.
- * $Id$
- */
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Attributes;
@@ -62,10 +57,14 @@
String id = select.getClientId(facesContext);
List<SelectItem> items = RenderUtil.getSelectItems(select);
+ boolean disabled = items.size() == 0
+ || ComponentUtils.getBooleanAttribute(select, Attributes.DISABLED)
+ || ComponentUtils.getBooleanAttribute(select, Attributes.READONLY);
+
writer.startElement(HtmlConstants.SELECT, select);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
- writer.writeAttribute(HtmlAttributes.DISABLED, ComponentUtils.getBooleanAttribute(select, Attributes.DISABLED));
+ writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);